svn commit: r274954 - head/usr.sbin/ctld
Author: trasz
Date: Mon Nov 24 08:13:44 2014
New Revision: 274954
URL: https://svnweb.freebsd.org/changeset/base/274954
Log:
Remove the pidfile clause from the ctl.conf example. Why do everyone
just copy/paste this line into their configs, it's beyond me.
MFC after:1 month
Sponsored by: The FreeBSD Foundation
Modified:
head/usr.sbin/ctld/ctl.conf.5
Modified: head/usr.sbin/ctld/ctl.conf.5
==
--- head/usr.sbin/ctld/ctl.conf.5 Mon Nov 24 08:13:21 2014
(r274953)
+++ head/usr.sbin/ctld/ctl.conf.5 Mon Nov 24 08:13:44 2014
(r274954)
@@ -27,7 +27,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd November 9, 2014
+.Dd November 24, 2014
.Dt CTL.CONF 5
.Os
.Sh NAME
@@ -356,8 +356,6 @@ configuration file.
.El
.Sh EXAMPLES
.Bd -literal
-pidfile/var/run/ctld.pid
-
auth-group ag0 {
chap-mutual "user" "secret" "mutualuser" "mutualsecret"
chap-mutual "user2" "secret2" "mutualuser" "mutualsecret"
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r274953 - in head/gnu/usr.bin/binutils: addr2line nm objcopy objdump readelf size strings
Author: bapt
Date: Mon Nov 24 08:13:21 2014
New Revision: 274953
URL: https://svnweb.freebsd.org/changeset/base/274953
Log:
Fix rendering of manpages with mandoc(1)
Modified:
head/gnu/usr.bin/binutils/addr2line/addr2line.1
head/gnu/usr.bin/binutils/nm/nm.1
head/gnu/usr.bin/binutils/objcopy/objcopy.1
head/gnu/usr.bin/binutils/objdump/objdump.1
head/gnu/usr.bin/binutils/readelf/readelf.1
head/gnu/usr.bin/binutils/size/size.1
head/gnu/usr.bin/binutils/strings/strings.1
Modified: head/gnu/usr.bin/binutils/addr2line/addr2line.1
==
--- head/gnu/usr.bin/binutils/addr2line/addr2line.1 Mon Nov 24 08:09:50
2014(r274952)
+++ head/gnu/usr.bin/binutils/addr2line/addr2line.1 Mon Nov 24 08:13:21
2014(r274953)
@@ -33,7 +33,7 @@
.ds R" ""
.ds C` ""
.ds C' ""
-'br\}
+\}
.el\{\
.ds -- \|\(em\|
.ds PI \(*p
@@ -107,7 +107,6 @@
.ds Ae A\h'-(\w'A'u*4/10)'E
.\" corrections for vroff
.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
.\" for low resolution devices (crt and lpr)
.if \n(.H>23 .if \n(.V>19 \
\{\
Modified: head/gnu/usr.bin/binutils/nm/nm.1
==
--- head/gnu/usr.bin/binutils/nm/nm.1 Mon Nov 24 08:09:50 2014
(r274952)
+++ head/gnu/usr.bin/binutils/nm/nm.1 Mon Nov 24 08:13:21 2014
(r274953)
@@ -33,7 +33,7 @@
.ds R" ""
.ds C` ""
.ds C' ""
-'br\}
+\}
.el\{\
.ds -- \|\(em\|
.ds PI \(*p
@@ -107,7 +107,6 @@
.ds Ae A\h'-(\w'A'u*4/10)'E
.\" corrections for vroff
.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
.\" for low resolution devices (crt and lpr)
.if \n(.H>23 .if \n(.V>19 \
\{\
Modified: head/gnu/usr.bin/binutils/objcopy/objcopy.1
==
--- head/gnu/usr.bin/binutils/objcopy/objcopy.1 Mon Nov 24 08:09:50 2014
(r274952)
+++ head/gnu/usr.bin/binutils/objcopy/objcopy.1 Mon Nov 24 08:13:21 2014
(r274953)
@@ -33,7 +33,7 @@
.ds R" ""
.ds C` ""
.ds C' ""
-'br\}
+\}
.el\{\
.ds -- \|\(em\|
.ds PI \(*p
@@ -107,7 +107,6 @@
.ds Ae A\h'-(\w'A'u*4/10)'E
.\" corrections for vroff
.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
.\" for low resolution devices (crt and lpr)
.if \n(.H>23 .if \n(.V>19 \
\{\
Modified: head/gnu/usr.bin/binutils/objdump/objdump.1
==
--- head/gnu/usr.bin/binutils/objdump/objdump.1 Mon Nov 24 08:09:50 2014
(r274952)
+++ head/gnu/usr.bin/binutils/objdump/objdump.1 Mon Nov 24 08:13:21 2014
(r274953)
@@ -33,7 +33,7 @@
.ds R" ""
.ds C` ""
.ds C' ""
-'br\}
+\}
.el\{\
.ds -- \|\(em\|
.ds PI \(*p
@@ -107,7 +107,6 @@
.ds Ae A\h'-(\w'A'u*4/10)'E
.\" corrections for vroff
.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
.\" for low resolution devices (crt and lpr)
.if \n(.H>23 .if \n(.V>19 \
\{\
Modified: head/gnu/usr.bin/binutils/readelf/readelf.1
==
--- head/gnu/usr.bin/binutils/readelf/readelf.1 Mon Nov 24 08:09:50 2014
(r274952)
+++ head/gnu/usr.bin/binutils/readelf/readelf.1 Mon Nov 24 08:13:21 2014
(r274953)
@@ -33,7 +33,7 @@
.ds R" ""
.ds C` ""
.ds C' ""
-'br\}
+\}
.el\{\
.ds -- \|\(em\|
.ds PI \(*p
@@ -107,7 +107,6 @@
.ds Ae A\h'-(\w'A'u*4/10)'E
.\" corrections for vroff
.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
.\" for low resolution devices (crt and lpr)
.if \n(.H>23 .if \n(.V>19 \
\{\
Modified: head/gnu/usr.bin/binutils/size/size.1
==
--- head/gnu/usr.bin/binutils/size/size.1 Mon Nov 24 08:09:50 2014
(r274952)
+++ head/gnu/usr.bin/binutils/size/size.1 Mon Nov 24 08:13:21 2014
(r274953)
@@ -33,7 +33,7 @@
.ds R" ""
.ds C` ""
.ds C' ""
-'br\}
+\}
.el\{\
.ds -- \|\(em\|
.ds PI \(*p
@@ -107,7 +107,6 @@
.ds Ae A\h'-(\w'A'u*4/10)'E
.\" corrections for vroff
.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
.\" for low resolution devices (crt and lpr)
.if \n(.H>23 .if \n(.V>19 \
\{\
Modified: head/gnu/usr.bin/binutils/strings/strings.1
===
Re: svn commit: r274925 - in head: lib/libc/sys lib/libdpv sbin/ipfw share/man/man4 share/man/man4/man4.arm share/man/man9 sys/boot/common sys/boot/i386/gptzfsboot usr.bin/dpv
On Mon, 24 Nov 2014 08:23:17 +0100, Joel Dahl wrote: On Sun, Nov 23, 2014 at 10:04:12PM +0100, Baptiste Daroussin wrote: On Sun, Nov 23, 2014 at 09:00:00PM +, Joel Dahl wrote: > Author: joel (doc committer) > Date: Sun Nov 23 21:00:00 2014 > New Revision: 274925 > URL: https://svnweb.freebsd.org/changeset/base/274925 > > Log: > Misc mdoc fixes: > > - Remove superfluous paragraph macros. > - Remove/fix empty or incorrect macros. > - Sort sections into conventional order. > - Terminate quoted strings properly. > - Remove EOL whitespace. > > Modified: > head/lib/libc/sys/poll.2 > head/lib/libdpv/dpv.3 > head/sbin/ipfw/ipfw.8 > head/share/man/man4/gre.4 > head/share/man/man4/man4.arm/cgem.4 > head/share/man/man4/me.4 > head/share/man/man4/netmap.4 > head/share/man/man9/get_cyclecount.9 > head/share/man/man9/malloc.9 > head/share/man/man9/sleepqueue.9 > head/sys/boot/common/zfsloader.8 > head/sys/boot/i386/gptzfsboot/gptzfsboot.8 > head/usr.bin/dpv/dpv.1 > [...] > +.Sh AUTHORS > +This manual page was written by > +.An Andriy Gapon Aq a...@freebsd.org . ^ There should be a Mt here to properly render in html I just picked one in the middle of this commit. In general every mail on any manpage Mt should be used. Sure. Feel free to go over our manpages and fix them. It's a minor issue. And while we're on the subject, there's a bit of background to this commit. Back in 2012 I started fixing mandoc lint errors/warnings in our manpage collection (excluding stuff from contrib/ and gnu/ etc.). I think I got them down from around ~4000 issues to almost zero. Quite a few manpages didn't even work with mandoc at the time, due to how many syntactical mdoc errors they had. The situation is still good, but I re-ran my scripts yesterday and found a slew of new warnings. I fixed a few obvious ones, but if someone with more time on his hands wants to help, please go ahead. A good starting point would probably the netmap.4 or ctl.conf.5 manpages, they seem to generate quite a few warnings. I'd also be grateful if everyone ran mandoc -Tlint on their manpages before committing. :-) A commit hook does magic for these kind of things. ;-) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r274960 - head/usr.bin/elfdump
Author: brueffer
Date: Mon Nov 24 09:31:38 2014
New Revision: 274960
URL: https://svnweb.freebsd.org/changeset/base/274960
Log:
Limit descriptors and enter capability mode.
Differential: D1009
Reviewed by: jonathan, pjd
MFC after:2 weeks
Relnotes: yes
Modified:
head/usr.bin/elfdump/elfdump.c
Modified: head/usr.bin/elfdump/elfdump.c
==
--- head/usr.bin/elfdump/elfdump.c Mon Nov 24 09:16:19 2014
(r274959)
+++ head/usr.bin/elfdump/elfdump.c Mon Nov 24 09:31:38 2014
(r274960)
@@ -29,12 +29,15 @@
__FBSDID("$FreeBSD$");
#include
+
+#include
#include
#include
#include
#include
#include
#include
+#include
#include
#include
#include
@@ -467,6 +470,7 @@ elf_get_shstrndx(Elf32_Ehdr *e, void *sh
int
main(int ac, char **av)
{
+ cap_rights_t rights;
u_int64_t phoff;
u_int64_t shoff;
u_int64_t phentsize;
@@ -527,6 +531,9 @@ main(int ac, char **av)
case 'w':
if ((out = fopen(optarg, "w")) == NULL)
err(1, "%s", optarg);
+ cap_rights_init(&rights, CAP_FSTAT, CAP_WRITE);
+ if (cap_rights_limit(fileno(out), &rights) < 0 && errno
!= ENOSYS)
+ err(1, "unable to limit rights for %s", optarg);
break;
case '?':
default:
@@ -539,6 +546,17 @@ main(int ac, char **av)
if ((fd = open(*av, O_RDONLY)) < 0 ||
fstat(fd, &sb) < 0)
err(1, "%s", *av);
+ cap_rights_init(&rights, CAP_MMAP_R);
+ if (cap_rights_limit(fd, &rights) < 0 && errno != ENOSYS)
+ err(1, "unable to limit rights for %s", *av);
+ close(STDIN_FILENO);
+ cap_rights_init(&rights, CAP_WRITE);
+ if (cap_rights_limit(STDOUT_FILENO, &rights) < 0 && errno != ENOSYS)
+ err(1, "unable to limit rights for stdout");
+ if (cap_rights_limit(STDERR_FILENO, &rights) < 0 && errno != ENOSYS)
+ err(1, "unable to limit rights for stderr");
+ if (cap_enter() < 0 && errno != ENOSYS)
+ err(1, "unable to enter capability mode");
e = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0);
if (e == MAP_FAILED)
err(1, NULL);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r274925 - in head: lib/libc/sys lib/libdpv sbin/ipfw share/man/man4 share/man/man4/man4.arm share/man/man9 sys/boot/common sys/boot/i386/gptzfsboot usr.bin/dpv
On Mon, Nov 24, 2014 at 10:19:08AM +0100, Ronald Klop wrote: > On Mon, 24 Nov 2014 08:23:17 +0100, Joel Dahl wrote: > > > On Sun, Nov 23, 2014 at 10:04:12PM +0100, Baptiste Daroussin wrote: > >> On Sun, Nov 23, 2014 at 09:00:00PM +, Joel Dahl wrote: > >> > Author: joel (doc committer) > >> > Date: Sun Nov 23 21:00:00 2014 > >> > New Revision: 274925 > >> > URL: https://svnweb.freebsd.org/changeset/base/274925 > >> > > >> > Log: > >> > Misc mdoc fixes: > >> > > >> > - Remove superfluous paragraph macros. > >> > - Remove/fix empty or incorrect macros. > >> > - Sort sections into conventional order. > >> > - Terminate quoted strings properly. > >> > - Remove EOL whitespace. > >> > > >> > Modified: > >> > head/lib/libc/sys/poll.2 > >> > head/lib/libdpv/dpv.3 > >> > head/sbin/ipfw/ipfw.8 > >> > head/share/man/man4/gre.4 > >> > head/share/man/man4/man4.arm/cgem.4 > >> > head/share/man/man4/me.4 > >> > head/share/man/man4/netmap.4 > >> > head/share/man/man9/get_cyclecount.9 > >> > head/share/man/man9/malloc.9 > >> > head/share/man/man9/sleepqueue.9 > >> > head/sys/boot/common/zfsloader.8 > >> > head/sys/boot/i386/gptzfsboot/gptzfsboot.8 > >> > head/usr.bin/dpv/dpv.1 > >> > > >> > >> [...] > >> > >> > +.Sh AUTHORS > >> > +This manual page was written by > >> > +.An Andriy Gapon Aq a...@freebsd.org . > >>^ There should be a Mt here to properly render > >> in html > >> > >> I just picked one in the middle of this commit. In general every mail > >> on any > >> manpage Mt should be used. > > > > Sure. Feel free to go over our manpages and fix them. It's a minor issue. > > > > And while we're on the subject, there's a bit of background to this > > commit. > > Back in 2012 I started fixing mandoc lint errors/warnings in our manpage > > collection (excluding stuff from contrib/ and gnu/ etc.). I think I got > > them > > down from around ~4000 issues to almost zero. Quite a few manpages didn't > > even work with mandoc at the time, due to how many syntactical mdoc > > errors > > they had. The situation is still good, but I re-ran my scripts yesterday > > and > > found a slew of new warnings. I fixed a few obvious ones, but if someone > > with > > more time on his hands wants to help, please go ahead. A good starting > > point > > would probably the netmap.4 or ctl.conf.5 manpages, they seem to generate > > quite a few warnings. > > > > I'd also be grateful if everyone ran mandoc -Tlint on their manpages > > before > > committing. :-) > > > > A commit hook does magic for these kind of things. ;-) Except that such commit hook will prevent updating openssl and/or kerberos :) Regards, Bapt pgpTuh58u57wt.pgp Description: PGP signature
Re: svn commit: r274960 - head/usr.bin/elfdump
On Mon, Nov 25, 2014 at 09:31:38AM +, Christian Brueffer wrote:
> Author: brueffer
> Date: Mon Nov 24 09:31:38 2014
> New Revision: 274960
> URL: https://svnweb.freebsd.org/changeset/base/274960
>
> Log:
> Limit descriptors and enter capability mode.
>
> Differential: D1009
> Reviewed by:jonathan, pjd
> MFC after: 2 weeks
> Relnotes: yes
>
> Modified:
> head/usr.bin/elfdump/elfdump.c
>
> Modified: head/usr.bin/elfdump/elfdump.c
> ==
> --- head/usr.bin/elfdump/elfdump.cMon Nov 24 09:16:19 2014
> (r274959)
> +++ head/usr.bin/elfdump/elfdump.cMon Nov 24 09:31:38 2014
> (r274960)
> @@ -29,12 +29,15 @@
> __FBSDID("$FreeBSD$");
>
> #include
> +
> +#include
Beware that MFC will not work oot of box as sys/capsicum.h is not in stable/10
the only way to do portable capsicum right now between freebsd branches is to
use sys/capability.h
Best regards,
Bapt
pgpaQ7XcPxWe_.pgp
Description: PGP signature
Re: svn commit: r274752 - in head/sys/mips: include mips
Hi,
thanks for pointing out. I fixed it.
I definetly had to pass universe.
Ruslan
On Sun, Nov 23, 2014 at 01:14:49PM -0800, Adrian Chadd wrote:
> Hi!
>
> You have some function declarations wrong. vm_offset_t != vm_paddr_t.
>
> eg:
>
> +void mipsNN_sdcache_wbinv_range_32(
> vm_paddr_t, vm_size_t);
>
> but
>
> +void
> +mipsNN_sdcache_wbinv_range_
> 32(vm_offset_t va, vm_size_t size)
>
> .. did you test this with a make universe pass?
>
> Thanks,
>
>
>
>
> -adrian
>
> On 20 November 2014 at 09:06, Ruslan Bukin wrote:
> > Author: br
> > Date: Thu Nov 20 17:06:41 2014
> > New Revision: 274752
> > URL: https://svnweb.freebsd.org/changeset/base/274752
> >
> > Log:
> > Add L2-cache writeback/flush operations. Supported 32,128-byte line-size,
> > else ignored. Cavium Networks also ignored as it has non-standard config
> > registers.
> >
> > Obtained from:NetBSD
> > Sponsored by: DARPA, AFRL
> >
> > Modified:
> > head/sys/mips/include/cache_mipsNN.h
> > head/sys/mips/include/cpuinfo.h
> > head/sys/mips/include/cpuregs.h
> > head/sys/mips/mips/cache.c
> > head/sys/mips/mips/cache_mipsNN.c
> > head/sys/mips/mips/cpu.c
> >
> > Modified: head/sys/mips/include/cache_mipsNN.h
> > ==
> > --- head/sys/mips/include/cache_mipsNN.hThu Nov 20 17:03:40 2014
> > (r274751)
> > +++ head/sys/mips/include/cache_mipsNN.hThu Nov 20 17:06:41 2014
> > (r274752)
> > @@ -67,5 +67,15 @@ void mipsNN_pdcache_wbinv_range_index_12
> > void mipsNN_pdcache_inv_range_128(vm_offset_t, vm_size_t);
> > void mipsNN_pdcache_wb_range_128(vm_offset_t, vm_size_t);
> > #endif
> > +void mipsNN_sdcache_wbinv_all_32(void);
> > +void mipsNN_sdcache_wbinv_range_32(vm_paddr_t, vm_size_t);
> > +void mipsNN_sdcache_wbinv_range_index_32(vm_paddr_t, vm_size_t);
> > +void mipsNN_sdcache_inv_range_32(vm_paddr_t, vm_size_t);
> > +void mipsNN_sdcache_wb_range_32(vm_paddr_t, vm_size_t);
> > +void mipsNN_sdcache_wbinv_all_128(void);
> > +void mipsNN_sdcache_wbinv_range_128(vm_paddr_t, vm_size_t);
> > +void mipsNN_sdcache_wbinv_range_index_128(vm_paddr_t, vm_size_t);
> > +void mipsNN_sdcache_inv_range_128(vm_paddr_t, vm_size_t);
> > +void mipsNN_sdcache_wb_range_128(vm_paddr_t, vm_size_t);
> >
> > #endif /* _MACHINE_CACHE_MIPSNN_H_ */
> >
> > Modified: head/sys/mips/include/cpuinfo.h
> > ==
> > --- head/sys/mips/include/cpuinfo.h Thu Nov 20 17:03:40 2014
> > (r274751)
> > +++ head/sys/mips/include/cpuinfo.h Thu Nov 20 17:06:41 2014
> > (r274752)
> > @@ -67,6 +67,12 @@ struct mips_cpuinfo {
> > u_int8_tdc_nways;
> > u_int16_t dc_nsets;
> > } l1;
> > + struct {
> > + u_int32_t dc_size;
> > + u_int8_tdc_linesize;
> > + u_int8_tdc_nways;
> > + u_int16_t dc_nsets;
> > + } l2;
> > };
> >
> > extern struct mips_cpuinfo cpuinfo;
> >
> > Modified: head/sys/mips/include/cpuregs.h
> > ==
> > --- head/sys/mips/include/cpuregs.h Thu Nov 20 17:03:40 2014
> > (r274751)
> > +++ head/sys/mips/include/cpuregs.h Thu Nov 20 17:06:41 2014
> > (r274752)
> > @@ -550,6 +550,13 @@
> > #define MIPS_CONFIG1_EP0x0002 /* EJTAG
> > implemented */
> > #define MIPS_CONFIG1_FP0x0001 /* FPU
> > implemented */
> >
> > +#define MIPS_CONFIG2_SA_SHIFT 0 /* Secondary cache
> > associativity */
> > +#define MIPS_CONFIG2_SA_MASK 0xf
> > +#define MIPS_CONFIG2_SL_SHIFT 4 /* Secondary cache
> > line size */
> > +#define MIPS_CONFIG2_SL_MASK 0xf
> > +#define MIPS_CONFIG2_SS_SHIFT 8 /* Secondary cache
> > sets per way */
> > +#define MIPS_CONFIG2_SS_MASK 0xf
> > +
> > #define MIPS_CONFIG4_MMUSIZEEXT0x00FF /* bits 7..
> > 0 MMU Size Extension */
> > #define MIPS_CONFIG4_MMUEXTDEF 0xC000 /* bits 15.14 MMU
> > Extension Definition */
> > #define MIPS_CONFIG4_MMUEXTDEF_MMUSIZEEXT 0x4000 /* This values
> > denotes CONFIG4 bits */
> >
> > Modified: head/sys/mips/mips/cache.c
> > ==
> > --- head/sys/mips/mips/cache.c Thu Nov 20 17:03:40 2014(r274751)
> > +++ head/sys/mips/mips/cache.c Thu Nov 20 17:06:41 2014(r274752)
> > @@ -260,19 +260,42 @@ mips_config_cache(struct mips_cpuinfo *
> > panic("no pdcache_wb_range");
> > }
> >
> > - /* XXXMIPS: No secondary cache handlers yet */
> > -#ifdef notyet
> > - if (mips_sdcache_size) {
> > -
svn commit: r274962 - head/sys/cam/ctl
Author: mav
Date: Mon Nov 24 11:37:27 2014
New Revision: 274962
URL: https://svnweb.freebsd.org/changeset/base/274962
Log:
Replace home-grown CTL IO allocator with UMA.
Old allocator created significant lock congestion protecting its lists
of preallocated I/Os, while UMA provides much better SMP scalability.
The downside of UMA is lack of reliable preallocation, that could guarantee
successful allocation in non-sleepable environments. But careful code
review shown, that only CAM target frontend really has that requirement.
Fix that making that frontend preallocate and statically bind CTL I/O for
every ATIO/INOT it preallocates any way. That allows to avoid allocations
in hot I/O path. Other frontends either may sleep in allocation context
or can properly handle allocation errors.
On 40-core server with 6 ZVOL-backed LUNs and 7 iSCSI client connections
this change increases peak performance from ~700K to >1M IOPS! Yay! :)
MFC after:1 month
Sponsored by: iXsystems, Inc.
Modified:
head/sys/cam/ctl/ctl.c
head/sys/cam/ctl/ctl_frontend.c
head/sys/cam/ctl/ctl_frontend_cam_sim.c
head/sys/cam/ctl/ctl_frontend_internal.c
head/sys/cam/ctl/ctl_frontend_iscsi.c
head/sys/cam/ctl/ctl_io.h
head/sys/cam/ctl/ctl_private.h
head/sys/cam/ctl/ctl_tpc.c
head/sys/cam/ctl/scsi_ctl.c
Modified: head/sys/cam/ctl/ctl.c
==
--- head/sys/cam/ctl/ctl.c Mon Nov 24 11:16:52 2014(r274961)
+++ head/sys/cam/ctl/ctl.c Mon Nov 24 11:37:27 2014(r274962)
@@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
@@ -644,7 +645,7 @@ ctl_isc_event_handler(ctl_ha_channel cha
#if 0
printf("Serialize\n");
#endif
- io = ctl_alloc_io((void *)ctl_softc->othersc_pool);
+ io = ctl_alloc_io_nowait(ctl_softc->othersc_pool);
if (io == NULL) {
printf("ctl_isc_event_handler: can't allocate "
"ctl_io!\n");
@@ -889,8 +890,8 @@ ctl_isc_event_handler(ctl_ha_channel cha
/* Handle resets sent from the other side */
case CTL_MSG_MANAGE_TASKS: {
struct ctl_taskio *taskio;
- taskio = (struct ctl_taskio *)ctl_alloc_io(
- (void *)ctl_softc->othersc_pool);
+ taskio = (struct ctl_taskio *)ctl_alloc_io_nowait(
+ ctl_softc->othersc_pool);
if (taskio == NULL) {
printf("ctl_isc_event_handler: can't allocate "
"ctl_io!\n");
@@ -918,8 +919,8 @@ ctl_isc_event_handler(ctl_ha_channel cha
}
/* Persistent Reserve action which needs attention */
case CTL_MSG_PERS_ACTION:
- presio = (struct ctl_prio *)ctl_alloc_io(
- (void *)ctl_softc->othersc_pool);
+ presio = (struct ctl_prio *)ctl_alloc_io_nowait(
+ ctl_softc->othersc_pool);
if (presio == NULL) {
printf("ctl_isc_event_handler: can't allocate "
"ctl_io!\n");
@@ -1003,7 +1004,7 @@ static int
ctl_init(void)
{
struct ctl_softc *softc;
- struct ctl_io_pool *internal_pool, *emergency_pool, *other_pool;
+ void *other_pool;
struct ctl_port *port;
int i, error, retval;
//int isc_retval;
@@ -1049,7 +1050,8 @@ ctl_init(void)
"Report no lun possible for invalid LUNs");
mtx_init(&softc->ctl_lock, "CTL mutex", NULL, MTX_DEF);
- mtx_init(&softc->pool_lock, "CTL pool mutex", NULL, MTX_DEF);
+ softc->io_zone = uma_zcreate("CTL IO", sizeof(union ctl_io),
+ NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0);
softc->open_count = 0;
/*
@@ -1086,36 +1088,15 @@ ctl_init(void)
STAILQ_INIT(&softc->fe_list);
STAILQ_INIT(&softc->port_list);
STAILQ_INIT(&softc->be_list);
- STAILQ_INIT(&softc->io_pools);
ctl_tpc_init(softc);
- if (ctl_pool_create(softc, CTL_POOL_INTERNAL, CTL_POOL_ENTRIES_INTERNAL,
- &internal_pool)!= 0){
- printf("ctl: can't allocate %d entry internal pool, "
- "exiting\n", CTL_POOL_ENTRIES_INTERNAL);
- return (ENOMEM);
- }
-
- if (ctl_pool_create(softc, CTL_POOL_EMERGENCY,
- CTL_POOL_ENTRIES_EMERGENCY, &emergency_pool) != 0) {
- printf("ctl: can't allocate %d entry emergency pool, "
- "exiting\n", CTL_POOL_ENTRIES_EMERGENCY);
- ctl_pool_free(internal_pool);
-
Re: svn commit: r274914 - in head/sys: kern sys ufs/ffs vm
Hi, Gleb,
I get some problems with it: I'm working on block device emulation
using virtio(4) in heterogeneous environment (FreeBSD/ARM frontend
provide block to FreeBSD/MIPS64 soft core). On a MIPS side I now
permanently receive panic below
Any idea ?
[...]
crypto: cryptosoft0 registers alg 22 flags 0 maxoplen 0
crypto: cryptosoft0 registers alg 21 flags 0 maxoplen 0
crypto: cryptosoft0 registers alg 17 flags 0 maxoplen 0
Device configuration finished.
Timecounters tick every 5.000 msec
crypto:
tcp_init: net.inet.tcp.tcbhashsize auto tuned to 4096
random: unblocking device.
GEOM: new disk vtbd0
MAP: No valid partition found at vtbd0
Trying to mount root from ufs:vtbd0 []...
WARNING: / was not properly dismounted
warning: no time-of-day clock registered, system time will not be set accurately
start_init: trying /sbin/init
mtlctl: open mtl_reg0: No such file or directory
Entropy harvesting:sysctl: unknown oid 'kern.ranndom.sys.harvest.interrupt': No
such file or directory
interruptssysctl: unknown oid 'kern.random.sys.harvest.ethernet': No such file
or directory
ethernetpanic: Bad link elm 0x98000f9a0090 next->prev != elm
KDB: enter: panic
[ thread pid 31 tid 100028 ]
Stopped at kdb_enter+0x8c: lui at,0x0
db>
On Sun, Nov 23, 2014 at 12:01:53PM +, Gleb Smirnoff wrote:
> Author: glebius
> Date: Sun Nov 23 12:01:52 2014
> New Revision: 274914
> URL: https://svnweb.freebsd.org/changeset/base/274914
>
> Log:
> Merge from projects/sendfile:
>
> o Provide a new VOP_GETPAGES_ASYNC(), which works like VOP_GETPAGES(), but
> doesn't sleep. It returns immediately, and will execute the I/O done
> handler
> function that must be supplied as argument.
> o Provide VOP_GETPAGES_ASYNC() for the FFS, which uses vnode_pager.
> o Extend pagertab to support pgo_getpages_async method, and implement this
> method for vnode_pager.
>
> Reviewed by:kib
> Tested by: pho
> Sponsored by: Netflix
> Sponsored by: Nginx, Inc.
>
> Modified:
> head/sys/kern/vfs_default.c
> head/sys/kern/vnode_if.src
> head/sys/sys/buf.h
> head/sys/sys/vnode.h
> head/sys/ufs/ffs/ffs_vnops.c
> head/sys/vm/swap_pager.c
> head/sys/vm/vm_pager.h
> head/sys/vm/vnode_pager.c
> head/sys/vm/vnode_pager.h
>
> Modified: head/sys/kern/vfs_default.c
> ==
> --- head/sys/kern/vfs_default.c Sun Nov 23 10:26:28 2014
> (r274913)
> +++ head/sys/kern/vfs_default.c Sun Nov 23 12:01:52 2014
> (r274914)
> @@ -83,6 +83,7 @@ static int vop_stdset_text(struct vop_se
> static int vop_stdunset_text(struct vop_unset_text_args *ap);
> static int vop_stdget_writecount(struct vop_get_writecount_args *ap);
> static int vop_stdadd_writecount(struct vop_add_writecount_args *ap);
> +static int vop_stdgetpages_async(struct vop_getpages_async_args *ap);
>
> /*
> * This vnode table stores what we want to do if the filesystem doesn't
> @@ -111,6 +112,7 @@ struct vop_vector default_vnodeops = {
> .vop_close =VOP_NULL,
> .vop_fsync =VOP_NULL,
> .vop_getpages = vop_stdgetpages,
> + .vop_getpages_async = vop_stdgetpages_async,
> .vop_getwritemount =vop_stdgetwritemount,
> .vop_inactive = VOP_NULL,
> .vop_ioctl =VOP_ENOTTY,
> @@ -725,7 +727,17 @@ vop_stdgetpages(ap)
> {
>
> return vnode_pager_generic_getpages(ap->a_vp, ap->a_m,
> - ap->a_count, ap->a_reqpage);
> + ap->a_count, ap->a_reqpage, NULL, NULL);
> +}
> +
> +static int
> +vop_stdgetpages_async(struct vop_getpages_async_args *ap)
> +{
> + int error;
> +
> + error = VOP_GETPAGES(ap->a_vp, ap->a_m, ap->a_count, ap->a_reqpage);
> + ap->a_iodone(ap->a_arg, ap->a_m, ap->a_reqpage, error);
> + return (error);
> }
>
> int
>
> Modified: head/sys/kern/vnode_if.src
> ==
> --- head/sys/kern/vnode_if.srcSun Nov 23 10:26:28 2014
> (r274913)
> +++ head/sys/kern/vnode_if.srcSun Nov 23 12:01:52 2014
> (r274914)
> @@ -476,6 +476,19 @@ vop_getpages {
> };
>
>
> +%% getpages_asyncvp L L L
> +
> +vop_getpages_async {
> + IN struct vnode *vp;
> + IN vm_page_t *m;
> + IN int count;
> + IN int reqpage;
> + IN vm_ooffset_t offset;
> + IN vop_getpages_iodone_t *iodone;
> + IN void *arg;
> +};
> +
> +
> %% putpages vp L L L
>
> vop_putpages {
>
> Modified: head/sys/sys/buf.h
> ==
> --- head/sys/sys/buf.hSun Nov 23 10:26:28 2014(r274913)
> +++ head/sys/sys/buf.hSun Nov 23 12:01:52 2014(r274914)
> @@ -107,7 +107,6 @@ struct buf {
> off_t b_offset; /* Offset into file. */
> TAILQ_ENTRY(buf) b_bobufs; /* (V) Buffer's associat
svn commit: r274964 - head
Author: ae Date: Mon Nov 24 12:53:56 2014 New Revision: 274964 URL: https://svnweb.freebsd.org/changeset/base/274964 Log: Add ip_gre.h to ObsoleteFiles.inc. Sponsored by: Yandex LLC Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Mon Nov 24 12:39:50 2014(r274963) +++ head/ObsoleteFiles.inc Mon Nov 24 12:53:56 2014(r274964) @@ -44,6 +44,8 @@ OLD_FILES+=usr/share/man/man4/faith.4.gz OLD_FILES+=usr/share/man/man4/if_faith.4.gz OLD_FILES+=usr/sbin/faithd OLD_FILES+=usr/share/man/man8/faithd.8.gz +# 20141107: overhaul if_gre(4) +OLD_FILES+=usr/include/netinet/ip_gre.h # 20141102: postrandom obsoleted by new /dev/random code OLD_FILES+=etc/rc.d/postrandom # 20141031: initrandom obsoleted by new /dev/random code ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r274965 - in head/etc: defaults rc.d
Author: trasz
Date: Mon Nov 24 13:02:39 2014
New Revision: 274965
URL: https://svnweb.freebsd.org/changeset/base/274965
Log:
Make it possible to specify flags for autofs daemons in rc.conf.
MFC after:1 month
Sponsored by: The FreeBSD Foundation
Modified:
head/etc/defaults/rc.conf
head/etc/rc.d/automount
Modified: head/etc/defaults/rc.conf
==
--- head/etc/defaults/rc.conf Mon Nov 24 12:53:56 2014(r274964)
+++ head/etc/defaults/rc.conf Mon Nov 24 13:02:39 2014(r274965)
@@ -317,7 +317,10 @@ amd_enable="NO"# Run amd service with
amd_program="/usr/sbin/amd"# path to amd, if you want a different one.
amd_flags="-a /.amd_mnt -l syslog /host /etc/amd.map /net /etc/amd.map"
amd_map_program="NO" # Can be set to "ypcat -k amd.master"
-autofs_enable="NO" # Run automountd(8)
+autofs_enable="NO" # Run autofs daemons.
+automount_flags="" # Flags to automount(8) (if autofs enabled).
+automountd_flags=""# Flags to automountd(8) (if autofs enabled).
+autounmountd_flags="" # Flags to autounmountd(8) (if autofs enabled).
nfs_client_enable="NO" # This host is an NFS client (or NO).
nfs_access_cache="60" # Client cache timeout in seconds
nfs_server_enable="NO" # This host is an NFS server (or NO).
Modified: head/etc/rc.d/automount
==
--- head/etc/rc.d/automount Mon Nov 24 12:53:56 2014(r274964)
+++ head/etc/rc.d/automount Mon Nov 24 13:02:39 2014(r274965)
@@ -18,7 +18,7 @@ required_modules="autofs"
automount_start()
{
- /usr/sbin/automount
+ /usr/sbin/automount ${automount_flags}
}
automount_stop()
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r274966 - head/sys/net
Author: philip
Date: Mon Nov 24 14:00:27 2014
New Revision: 274966
URL: https://svnweb.freebsd.org/changeset/base/274966
Log:
Add a sysctl `net.link.tap.deladdrs_on_close' to configure whether tap
should delete configured addresses and routes when the interface is
closed. Default is enabled (preserve current behaviour).
MFC after:1 week
Modified:
head/sys/net/if_tap.c
Modified: head/sys/net/if_tap.c
==
--- head/sys/net/if_tap.c Mon Nov 24 13:02:39 2014(r274965)
+++ head/sys/net/if_tap.c Mon Nov 24 14:00:27 2014(r274966)
@@ -156,6 +156,7 @@ static int tapdebug = 0;/* deb
static int tapuopen = 0;/* allow user open() */
static int tapuponopen = 0;/* IFF_UP on open() */
static int tapdclone = 1; /* enable devfs cloning */
+static int tapclosedeladdrs = 1; /* del addrs on close */
static SLIST_HEAD(, tap_softc) taphead; /* first device */
static struct clonedevs*tapclones;
@@ -172,6 +173,9 @@ SYSCTL_INT(_net_link_tap, OID_AUTO, up_o
"Bring interface up when /dev/tap is opened");
SYSCTL_INT(_net_link_tap, OID_AUTO, devfs_cloning, CTLFLAG_RWTUN, &tapdclone,
0,
"Enably legacy devfs interface creation");
+SYSCTL_INT(_net_link_tap, OID_AUTO, deladdrs_on_close, CTLFLAG_RW,
+ &tapclosedeladdrs, 0, "Delete addresses and routes when /dev/tap is "
+ "closed");
SYSCTL_INT(_net_link_tap, OID_AUTO, debug, CTLFLAG_RW, &tapdebug, 0, "");
DEV_MODULE(if_tap, tapmodevent, NULL);
@@ -536,7 +540,8 @@ tapclose(struct cdev *dev, int foo, int
* interface, if we are in VMnet mode. just close the device.
*/
- if (((tp->tap_flags & TAP_VMNET) == 0) && (ifp->if_flags & IFF_UP)) {
+ if (tapclosedeladdrs == 1 && ((tp->tap_flags & TAP_VMNET) == 0) &&
+ (ifp->if_flags & IFF_UP)) {
mtx_unlock(&tp->tap_mtx);
if_down(ifp);
mtx_lock(&tp->tap_mtx);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r274925 - in head: lib/libc/sys lib/libdpv sbin/ipfw share/man/man4 share/man/man4/man4.arm share/man/man9 sys/boot/common sys/boot/i386/gptzfsboot usr.bin/dpv
On Mon, 24 Nov 2014 10:38:14 +0100, Baptiste Daroussin wrote: On Mon, Nov 24, 2014 at 10:19:08AM +0100, Ronald Klop wrote: On Mon, 24 Nov 2014 08:23:17 +0100, Joel Dahl wrote: > On Sun, Nov 23, 2014 at 10:04:12PM +0100, Baptiste Daroussin wrote: >> On Sun, Nov 23, 2014 at 09:00:00PM +, Joel Dahl wrote: >> > Author: joel (doc committer) >> > Date: Sun Nov 23 21:00:00 2014 >> > New Revision: 274925 >> > URL: https://svnweb.freebsd.org/changeset/base/274925 >> > >> > Log: >> > Misc mdoc fixes: >> > >> > - Remove superfluous paragraph macros. >> > - Remove/fix empty or incorrect macros. >> > - Sort sections into conventional order. >> > - Terminate quoted strings properly. >> > - Remove EOL whitespace. >> > >> > Modified: >> > head/lib/libc/sys/poll.2 >> > head/lib/libdpv/dpv.3 >> > head/sbin/ipfw/ipfw.8 >> > head/share/man/man4/gre.4 >> > head/share/man/man4/man4.arm/cgem.4 >> > head/share/man/man4/me.4 >> > head/share/man/man4/netmap.4 >> > head/share/man/man9/get_cyclecount.9 >> > head/share/man/man9/malloc.9 >> > head/share/man/man9/sleepqueue.9 >> > head/sys/boot/common/zfsloader.8 >> > head/sys/boot/i386/gptzfsboot/gptzfsboot.8 >> > head/usr.bin/dpv/dpv.1 >> > >> >> [...] >> >> > +.Sh AUTHORS >> > +This manual page was written by >> > +.An Andriy Gapon Aq a...@freebsd.org . >>^ There should be a Mt here to properly render >> in html >> >> I just picked one in the middle of this commit. In general every mail >> on any >> manpage Mt should be used. > > Sure. Feel free to go over our manpages and fix them. It's a minor issue. > > And while we're on the subject, there's a bit of background to this > commit. > Back in 2012 I started fixing mandoc lint errors/warnings in our manpage > collection (excluding stuff from contrib/ and gnu/ etc.). I think I got > them > down from around ~4000 issues to almost zero. Quite a few manpages didn't > even work with mandoc at the time, due to how many syntactical mdoc > errors > they had. The situation is still good, but I re-ran my scripts yesterday > and > found a slew of new warnings. I fixed a few obvious ones, but if someone > with > more time on his hands wants to help, please go ahead. A good starting > point > would probably the netmap.4 or ctl.conf.5 manpages, they seem to generate > quite a few warnings. > > I'd also be grateful if everyone ran mandoc -Tlint on their manpages > before > committing. :-) > A commit hook does magic for these kind of things. ;-) Except that such commit hook will prevent updating openssl and/or kerberos :) Regards, Bapt Yes, at work people can commit does things by adding a line in the commit message. Like 'Allowed by: vendor code commit'. Otherwise major style errors just prevent the commit. It helps raising the awareness of what they are doing. Ronald. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r274967 - head/sys/dev/ffec
Author: ian
Date: Mon Nov 24 16:12:11 2014
New Revision: 274967
URL: https://svnweb.freebsd.org/changeset/base/274967
Log:
Add busdma sync ops before reading and after modifying the descriptor rings.
This was previously working by accident because BUSDMA_COHERENT_MEMORY has
always been set to strongly-ordered on arm. Now we're moving towards
normal-uncacheable (what might be called write-combining on other platforms)
and using the proper sync ops will be more important. Of course, that
opens the question of just what is the "proper" sync op for shared
concurrent dma access as opposed to accesses where the handoff of control
of the memory has well-defined sequence points that match the available
busdma sync operations.
Modified:
head/sys/dev/ffec/if_ffec.c
Modified: head/sys/dev/ffec/if_ffec.c
==
--- head/sys/dev/ffec/if_ffec.c Mon Nov 24 14:00:27 2014(r274966)
+++ head/sys/dev/ffec/if_ffec.c Mon Nov 24 16:12:11 2014(r274967)
@@ -652,7 +652,9 @@ ffec_txstart_locked(struct ffec_softc *s
}
if (enqueued != 0) {
+ bus_dmamap_sync(sc->txdesc_tag, sc->txdesc_map,
BUS_DMASYNC_PREWRITE);
WR4(sc, FEC_TDAR_REG, FEC_TDAR_TDAR);
+ bus_dmamap_sync(sc->txdesc_tag, sc->txdesc_map,
BUS_DMASYNC_POSTWRITE);
sc->tx_watchdog_count = WATCHDOG_TIMEOUT_SECS;
}
}
@@ -677,6 +679,9 @@ ffec_txfinish_locked(struct ffec_softc *
FFEC_ASSERT_LOCKED(sc);
+ /* XXX Can't set PRE|POST right now, but we need both. */
+ bus_dmamap_sync(sc->txdesc_tag, sc->txdesc_map, BUS_DMASYNC_PREREAD);
+ bus_dmamap_sync(sc->txdesc_tag, sc->txdesc_map, BUS_DMASYNC_POSTREAD);
ifp = sc->ifp;
retired_buffer = false;
while (sc->tx_idx_tail != sc->tx_idx_head) {
@@ -841,6 +846,9 @@ ffec_rxfinish_locked(struct ffec_softc *
FFEC_ASSERT_LOCKED(sc);
+ /* XXX Can't set PRE|POST right now, but we need both. */
+ bus_dmamap_sync(sc->rxdesc_tag, sc->rxdesc_map, BUS_DMASYNC_PREREAD);
+ bus_dmamap_sync(sc->rxdesc_tag, sc->rxdesc_map, BUS_DMASYNC_POSTREAD);
produced_empty_buffer = false;
for (;;) {
desc = &sc->rxdesc_ring[sc->rx_idx];
@@ -888,7 +896,9 @@ ffec_rxfinish_locked(struct ffec_softc *
}
if (produced_empty_buffer) {
+ bus_dmamap_sync(sc->rxdesc_tag, sc->txdesc_map,
BUS_DMASYNC_PREWRITE);
WR4(sc, FEC_RDAR_REG, FEC_RDAR_RDAR);
+ bus_dmamap_sync(sc->rxdesc_tag, sc->txdesc_map,
BUS_DMASYNC_POSTWRITE);
}
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r274925 - in head: lib/libc/sys lib/libdpv sbin/ipfw share/man/man4 share/man/man4/man4.arm share/man/man9 sys/boot/common sys/boot/i386/gptzfsboot usr.bin/dpv
"Ronald Klop" writes: > Joel Dahl writes: > > I'd also be grateful if everyone ran mandoc -Tlint on their manpages > > before committing. :-) > A commit hook does magic for these kind of things. ;-) A simpler alternative would be to write a unit test that checks all installed man pages (and ignores those that don't have a $FreeBSD$ tag, or whose $FreeBSD$ tag indicates that they reside in contrib or crypto) DES -- Dag-Erling Smørgrav - d...@des.no ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r274925 - in head: lib/libc/sys lib/libdpv sbin/ipfw share/man/man4 share/man/man4/man4.arm share/man/man9 sys/boot/common sys/boot/i386/gptzfsboot usr.bin/dpv
On Mon, Nov 24, 2014 at 05:38:22PM +0100, Dag-Erling Smørgrav wrote: > "Ronald Klop" writes: > > Joel Dahl writes: > > > I'd also be grateful if everyone ran mandoc -Tlint on their manpages > > > before committing. :-) > > A commit hook does magic for these kind of things. ;-) > A simpler alternative would be to write a unit test that checks all > installed man pages (and ignores those that don't have a $FreeBSD$ tag, > or whose $FreeBSD$ tag indicates that they reside in contrib or crypto) I think writing commit hook is not that complex[*] and more efficient. *: As an example: http://people.freebsd.org/~ak/mdoclint.sh.txt -- Alex ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r274914 - in head/sys: kern sys ufs/ffs vm
On Mon, Nov 24, 2014 at 11:05:37AM +, Ruslan Bukin wrote: > Hi, Gleb, > > I get some problems with it: I'm working on block device emulation > using virtio(4) in heterogeneous environment (FreeBSD/ARM frontend > provide block to FreeBSD/MIPS64 soft core). On a MIPS side I now > permanently receive panic below > > Any idea ? > > [...] > crypto: cryptosoft0 registers alg 22 flags 0 maxoplen 0 > crypto: cryptosoft0 registers alg 21 flags 0 maxoplen 0 > crypto: cryptosoft0 registers alg 17 flags 0 maxoplen 0 > Device configuration finished. > Timecounters tick every 5.000 msec > crypto: > tcp_init: net.inet.tcp.tcbhashsize auto tuned to 4096 > random: unblocking device. > GEOM: new disk vtbd0 > MAP: No valid partition found at vtbd0 > Trying to mount root from ufs:vtbd0 []... > WARNING: / was not properly dismounted > warning: no time-of-day clock registered, system time will not be set > accurately > start_init: trying /sbin/init > mtlctl: open mtl_reg0: No such file or directory > Entropy harvesting:sysctl: unknown oid 'kern.ranndom.sys.harvest.interrupt': > No such file or directory > interruptssysctl: unknown oid 'kern.random.sys.harvest.ethernet': No such > file or directory > ethernetpanic: Bad link elm 0x98000f9a0090 next->prev != elm > KDB: enter: panic > [ thread pid 31 tid 100028 ] > Stopped at kdb_enter+0x8c: lui at,0x0 > db> I this on stock kernel or on kernel with your modifications ? What is the backtrace ? What is the file/line where the panic occured ? Can mips dump vmcore ? ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r274914 - in head/sys: kern sys ufs/ffs vm
On Mon, Nov 24, 2014 at 07:37:33PM +0200, Konstantin Belousov wrote: > On Mon, Nov 24, 2014 at 11:05:37AM +, Ruslan Bukin wrote: > > Hi, Gleb, > > > > I get some problems with it: I'm working on block device emulation > > using virtio(4) in heterogeneous environment (FreeBSD/ARM frontend > > provide block to FreeBSD/MIPS64 soft core). On a MIPS side I now > > permanently receive panic below > > > > Any idea ? > > > > [...] > > crypto: cryptosoft0 registers alg 22 flags 0 maxoplen 0 > > crypto: cryptosoft0 registers alg 21 flags 0 maxoplen 0 > > crypto: cryptosoft0 registers alg 17 flags 0 maxoplen 0 > > Device configuration finished. > > Timecounters tick every 5.000 msec > > crypto: > > tcp_init: net.inet.tcp.tcbhashsize auto tuned to 4096 > > random: unblocking device. > > GEOM: new disk vtbd0 > > MAP: No valid partition found at vtbd0 > > Trying to mount root from ufs:vtbd0 []... > > WARNING: / was not properly dismounted > > warning: no time-of-day clock registered, system time will not be set > > accurately > > start_init: trying /sbin/init > > mtlctl: open mtl_reg0: No such file or directory > > Entropy harvesting:sysctl: unknown oid > > 'kern.ranndom.sys.harvest.interrupt': No such file or directory > > interruptssysctl: unknown oid 'kern.random.sys.harvest.ethernet': No such > > file or directory > > ethernetpanic: Bad link elm 0x98000f9a0090 next->prev != elm > > KDB: enter: panic > > [ thread pid 31 tid 100028 ] > > Stopped at kdb_enter+0x8c: lui at,0x0 > > db> > > I this on stock kernel or on kernel with your modifications ? Stock one. I also checked with no virtio but MDROOT - same problems. > What is the backtrace ? [...] warning: no time-of-day clock registered, system time will not be set accurately start_init: trying /sbin/init panic: vm_page_insert_after: msucc doesn't succeed pindex KDB: enter: panic [ thread pid 14 tid 100026 ] Stopped at kdb_enter+0x8c: lui at,0x0 db> bt Tracing pid 14 tid 100026 td 0x988854d0 db_trace_thread+40 (?,?,?,?) ra 80117654 sp c56b10f0 sz 16 801174c8+18c (0,?,,?) ra 80116730 sp c56b1100 sz 48 801162a8+488 (?,?,?,?) ra 801169fc sp c56b1130 sz 192 db_command_loop+f4 (?,?,?,?) ra 8011a570 sp c56b11f0 sz 16 8011a3c8+1a8 (?,?,?,?) ra 8027c678 sp c56b1200 sz 816 kdb_trap+188 (?,?,?,?) ra 804ab424 sp c56b1530 sz 64 trap+1114 (?,?,?,?) ra 804969bc sp c56b1570 sz 288 MipsKernGenException+154 (0,4,804f5340,12f) ra 8027c214 sp c56b1690 sz 368 kdb_enter+8c (?,?,?,?) ra 8022e808 sp c56b1800 sz 16 8022e658+1b0 (?,?,?,?) ra 8022e938 sp c56b1810 sz 32 kassert_panic+c8 (?,4,851600,3d7) ra 80476900 sp c56b1830 sz 96 804767e0+120 (?,?,?,?) ra 8047a2a8 sp c56b1890 sz 64 vm_page_alloc+7f8 (?,?,?,?) ra 8045e8a4 sp c56b18d0 sz 80 8045dd80+b24 (?,?,?,?) ra 0 sp c56b1920 sz 272 pid 14 db> [...] warning: no time-of-day clock registered, system time will not be set accurately start_init: trying /sbin/init panic: Bad list head 0x98851c30 first->prev != head KDB: enter: panic [ thread pid 14 tid 100026 ] Stopped at kdb_enter+0x8c: lui at,0x0 db> bt Tracing pid 14 tid 100026 td 0x988854d0 db_trace_thread+40 (?,?,?,?) ra 80117654 sp c56b10d0 sz 16 801174c8+18c (0,?,,?) ra 80116730 sp c56b10e0 sz 48 801162a8+488 (?,?,?,?) ra 801169fc sp c56b1110 sz 192 db_command_loop+f4 (?,?,?,?) ra 8011a570 sp c56b11d0 sz 16 8011a3c8+1a8 (?,?,?,?) ra 8027c678 sp c56b11e0 sz 816 kdb_trap+188 (?,?,?,?) ra 804ab424 sp c56b1510 sz 64 trap+1114 (?,?,?,?) ra 804969bc sp c56b1550 sz 288 MipsKernGenException+154 (0,4,804f5340,12f) ra 8027c214 sp c56b1670 sz 368 kdb_enter+8c (?,?,?,?) ra 8022e808 sp c56b17e0 sz 16 8022e658+1b0 (?,?,?,?) ra 8022e870 sp c56b17f0 sz 32 panic+30 (?,851c30,8051e990,8051e990) ra 80470ee8 sp c56b1810 sz 96 vm_object_shadow+178 (?,?,?,?) ra 804694c8 sp c56b1870 sz 48 vm_map_lookup+2f0 (56b1a68,e000,?,?) ra 8045de28 sp c56b18a0 sz 128 8045dd80+a8 (?,?,?,?) ra 0 sp c56b1920 sz 272 pid 14 db> > What is the file/line where the panic occured ? > Can mips dump vmcore ? not sure yet Ruslan ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r274970 - head/sys/kern
Author: jhb Date: Mon Nov 24 18:34:11 2014 New Revision: 274970 URL: https://svnweb.freebsd.org/changeset/base/274970 Log: Properly initialize the capability rights for vnodes exported to procstat that aren't for file descriptors (cwd, jdir, tracevp, etc.). Submitted by: Mikhail Modified: head/sys/kern/kern_descrip.c Modified: head/sys/kern/kern_descrip.c == --- head/sys/kern/kern_descrip.cMon Nov 24 18:11:16 2014 (r274969) +++ head/sys/kern/kern_descrip.cMon Nov 24 18:34:11 2014 (r274970) @@ -3096,6 +3096,7 @@ export_vnode_to_kinfo(struct vnode *vp, if (error == 0) kif->kf_status |= KF_ATTR_VALID; kif->kf_flags = xlate_fflags(fflags); + cap_rights_init(&kif->kf_cap_rights); kif->kf_fd = fd; kif->kf_ref_count = -1; kif->kf_offset = -1; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r274878 - head/sys/kern
On Saturday, November 22, 2014 1:15:02 pm Konstantin Belousov wrote: > Author: kib > Date: Sat Nov 22 18:15:02 2014 > New Revision: 274878 > URL: https://svnweb.freebsd.org/changeset/base/274878 > > Log: > The size value should be asserted when it is known. > > Reported and tested by: pho > Sponsored by: The FreeBSD Foundation Sorry, I did not have INVARIANTS in the kernel config I used to test the XSAVE core stuff. :( -- John Baldwin ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r274914 - in head/sys: kern sys ufs/ffs vm
On Mon, Nov 24, 2014 at 06:03:56PM +, Ruslan Bukin wrote: R> > I this on stock kernel or on kernel with your modifications ? R> R> Stock one. I also checked with no virtio but MDROOT - same problems. I could expect a panic with a damaged 'struct buf', but not vm_page. Can you please do a clean build pre-r274914, and then again a clean build of r274914, and then confirm that the former is stable, but the latter panics? -- Totus tuus, Glebius. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r274966 - head/sys/net
On Mon, Nov 24, 2014 at 02:00:28PM +, Philip Paeps wrote: P> Author: philip P> Date: Mon Nov 24 14:00:27 2014 P> New Revision: 274966 P> URL: https://svnweb.freebsd.org/changeset/base/274966 P> P> Log: P> Add a sysctl `net.link.tap.deladdrs_on_close' to configure whether tap P> should delete configured addresses and routes when the interface is P> closed. Default is enabled (preserve current behaviour). P> P> MFC after: 1 week Any time I see yet another sysctl knob added I ask myself: what if I want this feature on tap0 but doesn't want it on tap1? What if want it on host, but doesn't want it on vmnet-enabled jail? Where from could I learn about this sysctl if I am not subscribed to svn-src-*@? Of course adding a sysctl knob is faster and easier for a FreeBSD hacker. But is it a better for a FreeBSD user? Are we making OS for just ourselves? Look, we've got tapifioctl(). If you are too lazy to introduce new ioctl command and code it support in ifconfig, in this case you can just use any of IFF_LINK0, IFF_LINK1, IFF_LINK2 flag to toggle this feature via SIOCSIFFLAGS. And then document it in tap(4). Finally, if later some developer comes and does it in a proper way, then he would have a burden of supporting your sysctl for backwards compatibility, because you very quickly MFCed it. P.S. I am sorry if my email sounds like old man's grumbling. -- Totus tuus, Glebius. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r274976 - in head/sys: kern sys
Author: jhb
Date: Mon Nov 24 19:55:45 2014
New Revision: 274976
URL: https://svnweb.freebsd.org/changeset/base/274976
Log:
Add a bus_get_domain() wrapper around BUS_GET_DOMAIN(). Use this to add
a new per-device '%domain' sysctl node that returns the NUMA domain a
device is associated with if it is associated with one.
Note that this API is still a WIP and might change before 11.0 actually
ships.
Differential Revision:https://reviews.freebsd.org/D930
Reviewed by: kib, adrian
Modified:
head/sys/kern/subr_bus.c
head/sys/sys/bus.h
Modified: head/sys/kern/subr_bus.c
==
--- head/sys/kern/subr_bus.cMon Nov 24 19:50:01 2014(r274975)
+++ head/sys/kern/subr_bus.cMon Nov 24 19:55:45 2014(r274976)
@@ -285,6 +285,7 @@ static void
device_sysctl_init(device_t dev)
{
devclass_t dc = dev->devclass;
+ int domain;
if (dev->sysctl_tree != NULL)
return;
@@ -314,6 +315,10 @@ device_sysctl_init(device_t dev)
OID_AUTO, "%parent", CTLTYPE_STRING | CTLFLAG_RD,
dev, DEVICE_SYSCTL_PARENT, device_sysctl_handler, "A",
"parent device");
+ if (bus_get_domain(dev, &domain) == 0)
+ SYSCTL_ADD_INT(&dev->sysctl_ctx,
+ SYSCTL_CHILDREN(dev->sysctl_tree), OID_AUTO, "%domain",
+ CTLFLAG_RD, NULL, domain, "NUMA domain");
}
static void
@@ -4542,6 +4547,18 @@ bus_get_dma_tag(device_t dev)
return (BUS_GET_DMA_TAG(parent, dev));
}
+/**
+ * @brief Wrapper function for BUS_GET_DOMAIN().
+ *
+ * This function simply calls the BUS_GET_DOMAIN() method of the
+ * parent of @p dev.
+ */
+int
+bus_get_domain(device_t dev, int *domain)
+{
+ return (BUS_GET_DOMAIN(device_get_parent(dev), dev, domain));
+}
+
/* Resume all devices and then notify userland that we're up again. */
static int
root_resume(device_t dev)
Modified: head/sys/sys/bus.h
==
--- head/sys/sys/bus.h Mon Nov 24 19:50:01 2014(r274975)
+++ head/sys/sys/bus.h Mon Nov 24 19:55:45 2014(r274976)
@@ -392,6 +392,7 @@ int bus_activate_resource(device_t dev,
intbus_deactivate_resource(device_t dev, int type, int rid,
struct resource *r);
bus_dma_tag_t bus_get_dma_tag(device_t dev);
+intbus_get_domain(device_t dev, int *domain);
intbus_release_resource(device_t dev, int type, int rid,
struct resource *r);
intbus_free_resource(device_t dev, int type, struct resource *r);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r274978 - head/lib/libc/tests/ssp
Author: dim
Date: Mon Nov 24 20:07:09 2014
New Revision: 274978
URL: https://svnweb.freebsd.org/changeset/base/274978
Log:
For now, disable using -fsanitize=bounds for the libc ssp tests, when
using clang 3.5.0, until the runtime support (via compiler-rt) is added.
Otherwise, this would lead to link errors about missing support
libraries.
Modified:
head/lib/libc/tests/ssp/Makefile
Modified: head/lib/libc/tests/ssp/Makefile
==
--- head/lib/libc/tests/ssp/MakefileMon Nov 24 20:01:05 2014
(r274977)
+++ head/lib/libc/tests/ssp/MakefileMon Nov 24 20:07:09 2014
(r274978)
@@ -9,7 +9,10 @@ WARNS?=2
CFLAGS.h_raw+= -fstack-protector-all -Wstack-protector
.if ${COMPILER_TYPE} == "clang"
+# Disable -fsanitize=bounds until runtime support is done for clang 3.5.0.
+.if ${COMPILER_VERSION} < 30500
CFLAGS.h_raw+= -fsanitize=bounds
+.endif
.elif ${COMPILER_TYPE} == "gcc"
CFLAGS.h_raw+= --param ssp-buffer-size=1
DPADD+=${LIBSSP}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r274966 - head/sys/net
On 2014-11-24 22:40:22 (+0300), Gleb Smirnoff wrote: > On Mon, Nov 24, 2014 at 02:00:28PM +, Philip Paeps wrote: > P> Author: philip > P> Date: Mon Nov 24 14:00:27 2014 > P> New Revision: 274966 > P> URL: https://svnweb.freebsd.org/changeset/base/274966 > P> > P> Log: > P> Add a sysctl `net.link.tap.deladdrs_on_close' to configure whether tap > P> should delete configured addresses and routes when the interface is > P> closed. Default is enabled (preserve current behaviour). > P> > P> MFC after: 1 week > > Any time I see yet another sysctl knob added I ask myself: what if I want > this feature on tap0 but doesn't want it on tap1? What if want it on host, > but doesn't want it on vmnet-enabled jail? Where from could I learn about > this sysctl if I am not subscribed to svn-src-*@? I admit that this one was a hack written in anger a while back. When I hacked this, I was struggling with a bunch of bhyve instances with fiddly point to point routes and every time I restarted a bhyve, I'd have to fix my routing table again. That got frustrating quickly. Not an excuse. Just an explanation. > Of course adding a sysctl knob is faster and easier for a FreeBSD hacker. > But is it a better for a FreeBSD user? Are we making OS for just ourselves? > > Look, we've got tapifioctl(). If you are too lazy to introduce new > ioctl command and code it support in ifconfig, in this case you can just > use any of IFF_LINK0, IFF_LINK1, IFF_LINK2 flag to toggle this feature > via SIOCSIFFLAGS. And then document it in tap(4). Note that I semi-purposely didn't document this in tap(4). I should have pointed that out in the commit message, sorry. When I wrote this, this summer, I meant to ask about the magical and very legacy-looking VMware vmnet hacks in the driver. Are those still relevant? Is there still a VMWare port that relies on this? What about the comment that legacy devfs cloning interferes with ssh(1) (added seven years ago), is that still true? > Finally, if later some developer comes and does it in a proper way, then > he would have a burden of supporting your sysctl for backwards compatibility, > because you very quickly MFCed it. > > P.S. I am sorry if my email sounds like old man's grumbling. No problem. I'm happy to fix this 'better'. Old men often grumble sense (I keep telling myself as I get older...). Philip -- Philip Paeps Senior Reality Engineer Ministry of Information ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r274914 - in head/sys: kern sys ufs/ffs vm
On Mon, Nov 24, 2014 at 10:29:02PM +0300, Gleb Smirnoff wrote: > On Mon, Nov 24, 2014 at 06:03:56PM +, Ruslan Bukin wrote: > R> > I this on stock kernel or on kernel with your modifications ? > R> > R> Stock one. I also checked with no virtio but MDROOT - same problems. > > I could expect a panic with a damaged 'struct buf', but not vm_page. > > Can you please do a clean build pre-r274914, and then again a clean > build of r274914, and then confirm that the former is stable, but the > latter panics? Yes, I just proceeded re-check both builds with removing obj dir each time and I still see the problem starting with r274914. Also restoring files like that on latest head makes things happy (no panics): svnlite up -r274913 sys/kern/vfs_default.c sys/kern/vnode_if.src sys/sys/buf.h sys/sys/vnode.h sys/ufs/ffs/ffs_vnops.c sys/vm/swap_pager.c sys/vm/vm_pager.h sys/vm/vnode_pager.c sys/vm/vnode_pager.h Ruslan ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
RE: svn commit: r274925 - in head: lib/libc/sys lib/libdpv sbin/ipfw share/man/man4 share/man/man4/man4.arm share/man/man9 sys/boot/common sys/boot/i386/gptzfsboot usr.bin/dpv
> -Original Message- > From: owner-src-committ...@freebsd.org [mailto:owner-src- > committ...@freebsd.org] On Behalf Of Joel Dahl > Sent: Sunday, November 23, 2014 1:00 PM > To: src-committ...@freebsd.org; svn-src-...@freebsd.org; svn-src- > h...@freebsd.org > Subject: svn commit: r274925 - in head: lib/libc/sys lib/libdpv sbin/ipfw > share/man/man4 share/man/man4/man4.arm share/man/man9 > sys/boot/common sys/boot/i386/gptzfsboot usr.bin/dpv > > Author: joel (doc committer) > Date: Sun Nov 23 21:00:00 2014 > New Revision: 274925 > URL: https://svnweb.freebsd.org/changeset/base/274925 > > Log: > Misc mdoc fixes: > > - Remove superfluous paragraph macros. > - Remove/fix empty or incorrect macros. > - Sort sections into conventional order. > - Terminate quoted strings properly. > - Remove EOL whitespace. > > Modified: [snip] > head/lib/libdpv/dpv.3 [snip] > head/usr.bin/dpv/dpv.1 [snip] > Modified: head/lib/libdpv/dpv.3 > == > > --- head/lib/libdpv/dpv.3 Sun Nov 23 19:13:17 2014(r274924) > +++ head/lib/libdpv/dpv.3 Sun Nov 23 21:00:00 2014(r274925) > @@ -502,7 +502,7 @@ This does not effect > .Xr Xdialog 1 , > which renders the color escape sequences as plain text. > See > -.Do Li > +.Do > embedded "\\Z" sequences > .Dc > in > [snip] > Modified: head/usr.bin/dpv/dpv.1 > == > > --- head/usr.bin/dpv/dpv.1Sun Nov 23 19:13:17 2014(r274924) > +++ head/usr.bin/dpv/dpv.1Sun Nov 23 21:00:00 2014(r274925) > @@ -104,7 +104,7 @@ Do not use the default interface of > .Xr dialog 3 , > but instead spawn an instance of > .Xr dialog 1 . > -The path to > +The path to > .Xr dialog 1 > is taken from the > .Ev DIALOG > @@ -308,7 +308,6 @@ is required. > .It Pa $HOME/.dialogrc > .El > .Sh EXAMPLES > -.Pp > Simple example to show how fast > .Xr yes 1 > produces lines > @@ -358,7 +357,18 @@ Zeroing a disk: > .Bd -literal -offset indent > dpv -o /dev/md42 < /dev/zero > .Ed > -.Pp > +.Sh SEE ALSO > +.Xr dialog 1 , > +.Xr dialog 3 , > +.Xr sh 1 , > +.Xr Xdialog 1 > +.Sh HISTORY > +A > +.Nm > +utility first appeared in > +.Fx 11.0 . > +.Sh AUTHORS > +.An Devin Teske Aq dte...@freebsd.org > .Sh BUGS > .Xr Xdialog 1 , > when given both > @@ -410,21 +420,9 @@ This does not effect > .Xr Xdialog 1 , > which renders the color escape sequences as plain text. > See > -.Do Li > +.Do > embedded "\\Z" sequences > .Dc > in > .Xr dialog 1 > for additional information. > -.Sh SEE ALSO > -.Xr dialog 1 , > -.Xr dialog 3 , > -.Xr sh 1 , > -.Xr Xdialog 1 > -.Sh HISTORY > -A > -.Nm > -utility first appeared in > -.Fx 11.0 . > -.Sh AUTHORS > -.An Devin Teske Aq dte...@freebsd.org Should these changes be MFC'd to stable/10, stable/9? -- Devin ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r274984 - head/share/mk
Author: bapt
Date: Mon Nov 24 21:31:08 2014
New Revision: 274984
URL: https://svnweb.freebsd.org/changeset/base/274984
Log:
Implement LIBADD
LIBADD will automatically set DPADD and LDADD when needed including their
dependencies, LIBADD automatically handles private and internal libs so that
the end user Makefile does not have to care about it.
This allows to reduce overlinking on the base system leaving the framework get
the dependencies properly.
It also allows to built components binaries statically.
To use it:
Replace:
DPADD=${LIBARCHIVE} ${LIBSSL}
LDADD=-larchive -lssl
by:
LIBADD= archive ssl
Differential Revision:https://reviews.freebsd.org/D1209
Reviewed by: brooks imp
Modified:
head/share/mk/src.libnames.mk
Modified: head/share/mk/src.libnames.mk
==
--- head/share/mk/src.libnames.mk Mon Nov 24 20:57:20 2014
(r274983)
+++ head/share/mk/src.libnames.mk Mon Nov 24 21:31:08 2014
(r274984)
@@ -7,7 +7,182 @@
.error src.libnames.mk cannot be included directly.
.endif
-ROOTOBJDIR=
${.OBJDIR:S/${.CURDIR}//}${.MAKE.MAKEFILES:M*/src.libnames.mk:H:H:H}
+.include
+
+ROOTSRCDIR=${.MAKE.MAKEFILES:M*/src.libnames.mk:H:H:H}
+ROOTOBJDIR=${.OBJDIR:S/${.CURDIR}//}${ROOTSRCDIR}
+_PRIVATELIBS= \
+ atf_c \
+ atf_cxx \
+ bsdstat \
+ ldns \
+ sqlite3 \
+ ssh \
+ ucl \
+ unbound
+_INTERNALIBS= \
+ libmandoc \
+ ohash \
+ readline \
+ sm
+
+_LIBRARIES=\
+ archive \
+ atf_c \
+ atf_cxx \
+ bsdxml \
+ bsnmp \
+ bz2 \
+ cam \
+ capsicum \
+ casper \
+ cft \
+ crypt \
+ crypto \
+ cuse \
+ cxxrt \
+ devstat \
+ dialog \
+ dpv \
+ dwarf \
+ edit \
+ elf \
+ event \
+ execinfo \
+ fetch \
+ figpar \
+ geom \
+ gssapi \
+ ipsec \
+ jail \
+ kiconv \
+ kvm \
+ l \
+ ldns \
+ lzma \
+ m \
+ magic \
+ mandoc \
+ md \
+ memstat \
+ mp \
+ nandfs \
+ ncursesw \
+ nv \
+ opie \
+ pam \
+ pcap \
+ pjdlog \
+ proc \
+ procstat \
+ pthread \
+ radius \
+ readline \
+ rpcsec_gss \
+ rt \
+ sbuf \
+ sm \
+ smb \
+ ssh \
+ ssl \
+ stdthreads \
+ supcplusplus \
+ tacplus \
+ termcapw \
+ ucl \
+ ufs \
+ ulog \
+ usb \
+ util \
+ wrap \
+ y \
+ z
+
+_DP_archive= z bz2 lzma bsdxml
+.if ${MK_OPENSSL} != "no"
+_DP_archive+= crypto
+.else
+_DP_archive+= md
+.endif
+_DP_ssl= crypto
+_DP_ssh= crypto crypt
+_DP_edit= edit
+.if ${MK_OPENSSL} != "no"
+_DP_bsnmp= crypto
+.endif
+_DP_grom= bsdxml sbuf
+_DP_cam= sbuf
+_DP_casper=capsicum nv pjdlog
+_DP_capsicum= nv
+_DP_pjdlog=util
+_DP_opie= md
+_DP_usb= pthread
+_DP_unbound= pthread
+_DP_rt=pthread
+.if ${MK_OPENSSL} == "no"
+_DP_radius=md
+.else
+_DP_radius=crypto
+.endif
+_DP_procstat= kvm util elf
+.if ${MK_CXX} == "yes"
+.if ${MK_LIBCPLUSPLUS} != "no"
+_DP_proc= cxxrt
+.else
+_DP_proc= supcplusplus
+.endif
+.endif
+.if ${MK_CDDL} != "no"
+_DP_proc+= cft
+.endif
+_DP_mp=crypto
+_DP_memstat= kvm
+_DP_magic= z
+_DP_ldns= crypto
+.if ${MK_OPENSSL} != "no"
+_DP_fetch= ssl crypto
+.else
+_DP_fetch= md
+.endif
+_DP_execinfo= elf
+_DP_dwarf= elf
+_DP_dpv= dialog figpar util
+_DP_dialog=ncursesw m
+_DP_cuse= pthread
+_DP_atf_cxx= atf_c
+_DP_devstat= kvm
+
+# Define spacial cases
+LDADD_supcplusplus=-lsupc++
+
+.for _l in ${_LIBRARIES}
+.if ${_PRIVATELIBS:M${_l}}
+LDADD+=-L${LIB${_l:tu}DIR}
+.endif
+.if ${_INTERNALIBS:M${_l}}
+LDADD+=-L${LIB${_l:tu}DIR}
+.endif
+DPADD_${_l}?= ${LIB${_l:tu}}
+LDADD_${_l}?= -l${_l}
+.if defined(${_l}_depend) && defined(NO_SHARED)
+.for _d in ${_DP_${_l}}
+DPADD_${_l}+= ${DPADD_${_d}}
+LDADD_${_l}+= ${LDADD_${_d}}
+.endfor
+.endif
+.endfor
+
+# ucl needs and exposes lib
svn commit: r274985 - head/share/mk
Author: bapt
Date: Mon Nov 24 21:39:28 2014
New Revision: 274985
URL: https://svnweb.freebsd.org/changeset/base/274985
Log:
Correctly specify -L for internal and private libs
Modified:
head/share/mk/src.libnames.mk
Modified: head/share/mk/src.libnames.mk
==
--- head/share/mk/src.libnames.mk Mon Nov 24 21:31:08 2014
(r274984)
+++ head/share/mk/src.libnames.mk Mon Nov 24 21:39:28 2014
(r274985)
@@ -157,13 +157,13 @@ LDADD_supcplusplus= -lsupc++
.for _l in ${_LIBRARIES}
.if ${_PRIVATELIBS:M${_l}}
-LDADD+=-L${LIB${_l:tu}DIR}
+LDADD_${_l}_L+=-L${LIB${_l:tu}DIR}
.endif
.if ${_INTERNALIBS:M${_l}}
-LDADD+=-L${LIB${_l:tu}DIR}
+LDADD_${_l}_L+=-L${LIB${_l:tu}DIR}
.endif
DPADD_${_l}?= ${LIB${_l:tu}}
-LDADD_${_l}?= -l${_l}
+LDADD_${_l}?= ${LDADD_${_l}_L} -l${_l}
.if defined(${_l}_depend) && defined(NO_SHARED)
.for _d in ${_DP_${_l}}
DPADD_${_l}+= ${DPADD_${_d}}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r274986 - head/usr.sbin/pw
Author: brd (doc committer)
Date: Mon Nov 24 21:49:01 2014
New Revision: 274986
URL: https://svnweb.freebsd.org/changeset/base/274986
Log:
Convert to LIBADD.
Reviewed by: bapt
Modified:
head/usr.sbin/pw/Makefile
Modified: head/usr.sbin/pw/Makefile
==
--- head/usr.sbin/pw/Makefile Mon Nov 24 21:39:28 2014(r274985)
+++ head/usr.sbin/pw/Makefile Mon Nov 24 21:49:01 2014(r274986)
@@ -8,8 +8,7 @@ SRCS= pw.c pw_conf.c pw_user.c pw_group.
WARNS?=2
-DPADD= ${LIBCRYPT} ${LIBUTIL}
-LDADD= -lcrypt -lutil
+LIBADD=crypt util
.include
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r274987 - in head: contrib/mdocml lib lib/libgpio share/mk
Author: rpaulo
Date: Mon Nov 24 21:49:40 2014
New Revision: 274987
URL: https://svnweb.freebsd.org/changeset/base/274987
Log:
Import libgpio.
This is a thin wrapper around the kernel interface which should make
it easier to write GPIO applications. gpioctl(8) will be converted to
use this library in a separate commit.
Differential Revision:https://reviews.freebsd.org/D1183
Reviewed by: adrian, loos
Discussed on: arm@, embedded@
Relnotes: yes
Added:
head/lib/libgpio/
head/lib/libgpio/Makefile (contents, props changed)
head/lib/libgpio/gpio.3 (contents, props changed)
head/lib/libgpio/gpio.c (contents, props changed)
head/lib/libgpio/libgpio.h (contents, props changed)
Modified:
head/contrib/mdocml/lib.in
head/lib/Makefile
head/share/mk/bsd.libnames.mk
Modified: head/contrib/mdocml/lib.in
==
--- head/contrib/mdocml/lib.in Mon Nov 24 21:49:01 2014(r274986)
+++ head/contrib/mdocml/lib.in Mon Nov 24 21:49:40 2014(r274987)
@@ -56,6 +56,7 @@ LINE("libftpio", "FTP Connection Managem
LINE("libform","Curses Form Library (libform, \\-lform)")
LINE("libgeom","Userland API Library for Kernel GEOM subsystem
(libgeom, \\-lgeom)")
LINE("libgpib","General-Purpose Instrument Bus (GPIB) library
(libgpib, \\-lgpib)")
+LINE("libgpio","General-Purpose Input Output (GPIO) library
(libgpio, \\-lgpio)")
LINE("libhammer", "HAMMER Filesystem Userland Library (libhammer,
\\-lhammer)")
LINE("libi386","i386 Architecture Library (libi386, \\-li386)")
LINE("libintl","Internationalized Message Handling Library
(libintl, \\-lintl)")
Modified: head/lib/Makefile
==
--- head/lib/Makefile Mon Nov 24 21:49:01 2014(r274986)
+++ head/lib/Makefile Mon Nov 24 21:49:40 2014(r274987)
@@ -52,6 +52,7 @@ SUBDIR= ${SUBDIR_ORDERED} \
libfigpar \
libgeom \
${_libgpib} \
+ libgpio \
${_libgssapi} \
${_librpcsec_gss} \
${_libiconv_modules} \
Added: head/lib/libgpio/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libgpio/Makefile Mon Nov 24 21:49:40 2014(r274987)
@@ -0,0 +1,35 @@
+# $FreeBSD$
+
+LIB= gpio
+SHLIB_MAJOR= 0
+
+SRCS= gpio.c
+INCS= libgpio.h
+MAN+= gpio.3
+
+CFLAGS+= -I${.CURDIR}
+
+MLINKS=gpio.3 gpio_open.3 \
+ gpio.3 gpio_open_device.3 \
+ gpio.3 gpio_close.3 \
+ gpio.3 gpio_pin_list.3 \
+ gpio.3 gpio_pin_config.3 \
+ gpio.3 gpio_pin_set_flags.3 \
+ gpio.3 gpio_pin_get.3 \
+ gpio.3 gpio_pin_set.3 \
+ gpio.3 gpio_pin_low.3 \
+ gpio.3 gpio_pin_high.3 \
+ gpio.3 gpio_pin_input.3 \
+ gpio.3 gpio_pin_output.3 \
+ gpio.3 gpio_pin_opendrain.3 \
+ gpio.3 gpio_pin_pushpull.3 \
+ gpio.3 gpio_pin_tristate.3 \
+ gpio.3 gpio_pin_pullup.3 \
+ gpio.3 gpio_pin_pulldown.3 \
+ gpio.3 gpio_pin_invin.3 \
+ gpio.3 gpio_pin_invout.3 \
+ gpio.3 gpio_pin_pulsate.3
+
+WARNS?=6
+
+.include
Added: head/lib/libgpio/gpio.3
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libgpio/gpio.3 Mon Nov 24 21:49:40 2014(r274987)
@@ -0,0 +1,192 @@
+.\"
+.\" Copyright (c) 2014 Rui Paulo
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"notice, this list of conditions and the following disclaimer in the
+.\"documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
svn commit: r274988 - head/sys/netinet6
Author: ae Date: Mon Nov 24 21:51:43 2014 New Revision: 274988 URL: https://svnweb.freebsd.org/changeset/base/274988 Log: Skip L2 addresses lookups for p2p interfaces. Discussed with: melifaro Sponsored by: Yandex LLC Modified: head/sys/netinet6/nd6.c Modified: head/sys/netinet6/nd6.c == --- head/sys/netinet6/nd6.c Mon Nov 24 21:49:40 2014(r274987) +++ head/sys/netinet6/nd6.c Mon Nov 24 21:51:43 2014(r274988) @@ -2206,9 +2206,6 @@ nd6_need_cache(struct ifnet *ifp) case IFT_IEEE80211: #endif case IFT_INFINIBAND: - case IFT_GIF: /* XXX need more cases? */ - case IFT_PPP: - case IFT_TUNNEL: case IFT_BRIDGE: case IFT_PROPVIRTUAL: return (1); @@ -2235,6 +2232,8 @@ nd6_add_ifa_lle(struct in6_ifaddr *ia) struct llentry *ln; ifp = ia->ia_ifa.ifa_ifp; + if (nd6_need_cache(ifp) == 0) + return (0); IF_AFDATA_LOCK(ifp); ia->ia_ifa.ifa_rtrequest = nd6_rtrequest; ln = lla_lookup(LLTABLE6(ifp), (LLE_CREATE | LLE_IFADDR | ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r274989 - in head: share/mk usr.bin/mandoc
Author: bapt
Date: Mon Nov 24 22:12:27 2014
New Revision: 274989
URL: https://svnweb.freebsd.org/changeset/base/274989
Log:
Convert mandoc to LIBADD
While here remove the ugly LDMANDOC
Modified:
head/share/mk/src.libnames.mk
head/usr.bin/mandoc/Makefile
Modified: head/share/mk/src.libnames.mk
==
--- head/share/mk/src.libnames.mk Mon Nov 24 21:51:43 2014
(r274988)
+++ head/share/mk/src.libnames.mk Mon Nov 24 22:12:27 2014
(r274989)
@@ -21,7 +21,7 @@ _PRIVATELIBS= \
ucl \
unbound
_INTERNALIBS= \
- libmandoc \
+ mandoc \
ohash \
readline \
sm
@@ -237,7 +237,6 @@ LDSQLITE3?= ${LIBSQLITE3DIR}/libsqlite3.
LIBSQLITE3?= ${LIBSQLITE3DIR}/libsqlite3.a
LIBMANDOCDIR= ${ROOTOBJDIR}/lib/libmandoc
-LDMANDOC?= ${LIBMANDOCDIR}/libmandoc.a
LIBMANDOC?=${LIBMANDOCDIR}/libmandoc.a
LIBSMDIR= ${ROOTOBJDIR}/lib/libsm
Modified: head/usr.bin/mandoc/Makefile
==
--- head/usr.bin/mandoc/MakefileMon Nov 24 21:51:43 2014
(r274988)
+++ head/usr.bin/mandoc/MakefileMon Nov 24 22:12:27 2014
(r274989)
@@ -1,7 +1,6 @@
# $FreeBSD$
MDOCMLDIR= ${.CURDIR}/../../contrib/mdocml
-LIBMANDOC= ${.OBJDIR}/../../lib/libmandoc/libmandoc.a
.PATH: ${MDOCMLDIR}
PROG= mandoc
@@ -33,7 +32,6 @@ SRCS= ${HTML_SRCS} \
WARNS?=3
CFLAGS+= -DHAVE_CONFIG_H
-DPADD= ${LIBMANDOC}
-LDADD= ${LIBMANDOC}
+LIBADD=mandoc
.include
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r274990 - in head: share/mk usr.sbin/makefs
Author: bapt
Date: Mon Nov 24 22:15:30 2014
New Revision: 274990
URL: https://svnweb.freebsd.org/changeset/base/274990
Log:
Convert makefs to LIBADD
Add definition of libnetbsd in src.libnames.mk
Modified:
head/share/mk/src.libnames.mk
head/usr.sbin/makefs/Makefile
Modified: head/share/mk/src.libnames.mk
==
--- head/share/mk/src.libnames.mk Mon Nov 24 22:12:27 2014
(r274989)
+++ head/share/mk/src.libnames.mk Mon Nov 24 22:15:30 2014
(r274990)
@@ -22,6 +22,7 @@ _PRIVATELIBS= \
unbound
_INTERNALIBS= \
mandoc \
+ netbsd \
ohash \
readline \
sm
@@ -68,6 +69,7 @@ _LIBRARIES= \
mp \
nandfs \
ncursesw \
+ netbsd \
nv \
opie \
pam \
@@ -242,3 +244,6 @@ LIBMANDOC?= ${LIBMANDOCDIR}/libmandoc.a
LIBSMDIR= ${ROOTOBJDIR}/lib/libsm
LDSM?= ${LIBSMDIR}/libsm.a
LIBSM?=${LIBSMDIR}/libsm.a
+
+LIBNETBSDDIR= ${ROOTOBJDIR}/lib/libnetbsd
+LIBNETBSD= ${ROOTOBJDIR}/libnetbsd.a
Modified: head/usr.sbin/makefs/Makefile
==
--- head/usr.sbin/makefs/Makefile Mon Nov 24 22:12:27 2014
(r274989)
+++ head/usr.sbin/makefs/Makefile Mon Nov 24 22:15:30 2014
(r274990)
@@ -30,12 +30,6 @@ SRCS+= pack_dev.c
SRCS+= ffs_tables.c
CFLAGS+= -I${.CURDIR}/../../lib/libnetbsd
-LIBNETBSDDIR= ${.OBJDIR}/../../lib/libnetbsd
-LIBNETBSD= ${LIBNETBSDDIR}/libnetbsd.a
-DPADD+=${LIBNETBSD}
-LDADD+=${LIBNETBSD}
-
-DPADD+= ${LIBSBUF} ${LIBUTIL}
-LDADD+= -lsbuf -lutil
+LIBADD=netbsd util sbuf
.include
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r274991 - head/share/mk
Author: bapt
Date: Mon Nov 24 22:17:35 2014
New Revision: 274991
URL: https://svnweb.freebsd.org/changeset/base/274991
Log:
Each time something links to sqlite3 it should link to pthread
Modified:
head/share/mk/src.libnames.mk
Modified: head/share/mk/src.libnames.mk
==
--- head/share/mk/src.libnames.mk Mon Nov 24 22:15:30 2014
(r274990)
+++ head/share/mk/src.libnames.mk Mon Nov 24 22:17:35 2014
(r274991)
@@ -15,6 +15,7 @@ _PRIVATELIBS= \
atf_c \
atf_cxx \
bsdstat \
+ heimipcc \
ldns \
sqlite3 \
ssh \
@@ -29,6 +30,7 @@ _INTERNALIBS= \
_LIBRARIES=\
archive \
+ asn1 \
atf_c \
atf_cxx \
bsdxml \
@@ -38,6 +40,7 @@ _LIBRARIES= \
capsicum \
casper \
cft \
+ com_err \
crypt \
crypto \
cuse \
@@ -54,10 +57,14 @@ _LIBRARIES= \
figpar \
geom \
gssapi \
+ heimbase \
+ heimipcc \
+ hx509 \
ipsec \
jail \
kiconv \
kvm \
+ krb5 \
l \
ldns \
lzma \
@@ -80,6 +87,7 @@ _LIBRARIES= \
pthread \
radius \
readline \
+ roken \
rpcsec_gss \
rt \
sbuf \
@@ -96,6 +104,7 @@ _LIBRARIES= \
ulog \
usb \
util \
+ wind \
wrap \
y \
z
@@ -178,6 +187,9 @@ LDADD_${_l}+= ${LDADD_${_d}}
DPADD_ucl+=${DPADD_m}
LDADD_ucl+=${LDADD_m}
+DPADD_sqlite3+=${DPADD_pthread}
+DPADD_sqlite3+=${LDADD_pthread}
+
.for _l in ${LIBADD}
.if ${_PRIVATELIBS:M${_l}}
USEPRIVATELIB+=${_l}
@@ -186,6 +198,10 @@ DPADD+=${DPADD_${_l}}
LDADD+=${LDADD_${_l}}
.endfor
+.if defined(USEPRIVATELIB)
+LDFLAGS+= -rpath ${LIBPRIVATEDIR}
+.endif
+
LIBATF_CDIR= ${ROOTOBJDIR}/lib/atf/libatf-c
LDATF_C?= ${LIBATF_CDIR}/libatf-c.so
LIBATF_C?= ${LIBATF_CDIR}/libatf-c.a
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r274991 - head/share/mk
On Mon, Nov 24, 2014 at 10:17:36PM +, Baptiste Daroussin wrote: > Author: bapt > Date: Mon Nov 24 22:17:35 2014 > New Revision: 274991 > URL: https://svnweb.freebsd.org/changeset/base/274991 > > Log: > Each time something links to sqlite3 it should link to pthread > Hey closed the editor too fast. Define more libraries Add rpath for everything linking to a privatelib regards, Bapt pgp5cGjrHyF6O.pgp Description: PGP signature
Re: svn commit: r274962 - head/sys/cam/ctl
On 1124T1137, Alexander Motin wrote: > Author: mav > Date: Mon Nov 24 11:37:27 2014 > New Revision: 274962 > URL: https://svnweb.freebsd.org/changeset/base/274962 > > Log: > Replace home-grown CTL IO allocator with UMA. > > Old allocator created significant lock congestion protecting its lists > of preallocated I/Os, while UMA provides much better SMP scalability. > The downside of UMA is lack of reliable preallocation, that could guarantee > successful allocation in non-sleepable environments. But careful code > review shown, that only CAM target frontend really has that requirement. > Fix that making that frontend preallocate and statically bind CTL I/O for > every ATIO/INOT it preallocates any way. That allows to avoid allocations > in hot I/O path. Other frontends either may sleep in allocation context > or can properly handle allocation errors. > > On 40-core server with 6 ZVOL-backed LUNs and 7 iSCSI client connections > this change increases peak performance from ~700K to >1M IOPS! Yay! :) Hell yeah! ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r274992 - head/share/mk
Author: bapt
Date: Mon Nov 24 22:29:16 2014
New Revision: 274992
URL: https://svnweb.freebsd.org/changeset/base/274992
Log:
Avoid code duplication by directly adding _INSTALLLIBS and _PRIVATELIBS into
_LIBRARIES
Reported by: emaste
Modified:
head/share/mk/src.libnames.mk
Modified: head/share/mk/src.libnames.mk
==
--- head/share/mk/src.libnames.mk Mon Nov 24 22:17:35 2014
(r274991)
+++ head/share/mk/src.libnames.mk Mon Nov 24 22:29:16 2014
(r274992)
@@ -21,6 +21,7 @@ _PRIVATELIBS= \
ssh \
ucl \
unbound
+
_INTERNALIBS= \
mandoc \
netbsd \
@@ -29,10 +30,10 @@ _INTERNALIBS= \
sm
_LIBRARIES=\
+ ${_PRIVATELIBS} \
+ ${_INTERNALIBS} \
archive \
asn1 \
- atf_c \
- atf_cxx \
bsdxml \
bsnmp \
bz2 \
@@ -58,7 +59,6 @@ _LIBRARIES= \
geom \
gssapi \
heimbase \
- heimipcc \
hx509 \
ipsec \
jail \
@@ -66,7 +66,6 @@ _LIBRARIES= \
kvm \
krb5 \
l \
- ldns \
lzma \
m \
magic \
@@ -76,7 +75,6 @@ _LIBRARIES= \
mp \
nandfs \
ncursesw \
- netbsd \
nv \
opie \
pam \
@@ -93,13 +91,11 @@ _LIBRARIES= \
sbuf \
sm \
smb \
- ssh \
ssl \
stdthreads \
supcplusplus \
tacplus \
termcapw \
- ucl \
ufs \
ulog \
usb \
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r274994 - head/share/mk
Author: bapt
Date: Mon Nov 24 22:35:32 2014
New Revision: 274994
URL: https://svnweb.freebsd.org/changeset/base/274994
Log:
Fix typo
Modified:
head/share/mk/src.libnames.mk
Modified: head/share/mk/src.libnames.mk
==
--- head/share/mk/src.libnames.mk Mon Nov 24 22:32:18 2014
(r274993)
+++ head/share/mk/src.libnames.mk Mon Nov 24 22:35:32 2014
(r274994)
@@ -184,7 +184,7 @@ DPADD_ucl+= ${DPADD_m}
LDADD_ucl+=${LDADD_m}
DPADD_sqlite3+=${DPADD_pthread}
-DPADD_sqlite3+=${LDADD_pthread}
+LDADD_sqlite3+=${LDADD_pthread}
.for _l in ${LIBADD}
.if ${_PRIVATELIBS:M${_l}}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r274993 - head/share/mk
Author: bapt
Date: Mon Nov 24 22:32:18 2014
New Revision: 274993
URL: https://svnweb.freebsd.org/changeset/base/274993
Log:
Fix dependencies in case of building statically
Modified:
head/share/mk/src.libnames.mk
Modified: head/share/mk/src.libnames.mk
==
--- head/share/mk/src.libnames.mk Mon Nov 24 22:29:16 2014
(r274992)
+++ head/share/mk/src.libnames.mk Mon Nov 24 22:32:18 2014
(r274993)
@@ -171,7 +171,7 @@ LDADD_${_l}_L+= -L${LIB${_l:tu}DIR}
.endif
DPADD_${_l}?= ${LIB${_l:tu}}
LDADD_${_l}?= ${LDADD_${_l}_L} -l${_l}
-.if defined(${_l}_depend) && defined(NO_SHARED)
+.if defined(_DP_${_l}) && defined(NO_SHARED)
.for _d in ${_DP_${_l}}
DPADD_${_l}+= ${DPADD_${_d}}
LDADD_${_l}+= ${LDADD_${_d}}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r274995 - head/usr.bin/demandoc
Author: bapt
Date: Mon Nov 24 23:29:56 2014
New Revision: 274995
URL: https://svnweb.freebsd.org/changeset/base/274995
Log:
Forgot to convert demandoc along with mandoc
Modified:
head/usr.bin/demandoc/Makefile
Modified: head/usr.bin/demandoc/Makefile
==
--- head/usr.bin/demandoc/Makefile Mon Nov 24 22:35:32 2014
(r274994)
+++ head/usr.bin/demandoc/Makefile Mon Nov 24 23:29:56 2014
(r274995)
@@ -4,9 +4,8 @@
PROG= demandoc
-LDADD= ${LDMANDOC}
-DPADD= ${LIBMANDOC}
-
WARNS?=5
+LIBADD=mandoc
+
.include
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r274914 - in head/sys: kern sys ufs/ffs vm
Why'd you make it all a union in strict buf?
Adrian
On Nov 23, 2014 5:01 AM, "Gleb Smirnoff" wrote:
> Author: glebius
> Date: Sun Nov 23 12:01:52 2014
> New Revision: 274914
> URL: https://svnweb.freebsd.org/changeset/base/274914
>
> Log:
> Merge from projects/sendfile:
>
> o Provide a new VOP_GETPAGES_ASYNC(), which works like VOP_GETPAGES(),
> but
> doesn't sleep. It returns immediately, and will execute the I/O done
> handler
> function that must be supplied as argument.
> o Provide VOP_GETPAGES_ASYNC() for the FFS, which uses vnode_pager.
> o Extend pagertab to support pgo_getpages_async method, and implement
> this
> method for vnode_pager.
>
> Reviewed by: kib
> Tested by:pho
> Sponsored by: Netflix
> Sponsored by: Nginx, Inc.
>
> Modified:
> head/sys/kern/vfs_default.c
> head/sys/kern/vnode_if.src
> head/sys/sys/buf.h
> head/sys/sys/vnode.h
> head/sys/ufs/ffs/ffs_vnops.c
> head/sys/vm/swap_pager.c
> head/sys/vm/vm_pager.h
> head/sys/vm/vnode_pager.c
> head/sys/vm/vnode_pager.h
>
> Modified: head/sys/kern/vfs_default.c
>
> ==
> --- head/sys/kern/vfs_default.c Sun Nov 23 10:26:28 2014(r274913)
> +++ head/sys/kern/vfs_default.c Sun Nov 23 12:01:52 2014(r274914)
> @@ -83,6 +83,7 @@ static int vop_stdset_text(struct vop_se
> static int vop_stdunset_text(struct vop_unset_text_args *ap);
> static int vop_stdget_writecount(struct vop_get_writecount_args *ap);
> static int vop_stdadd_writecount(struct vop_add_writecount_args *ap);
> +static int vop_stdgetpages_async(struct vop_getpages_async_args *ap);
>
> /*
> * This vnode table stores what we want to do if the filesystem doesn't
> @@ -111,6 +112,7 @@ struct vop_vector default_vnodeops = {
> .vop_close =VOP_NULL,
> .vop_fsync =VOP_NULL,
> .vop_getpages = vop_stdgetpages,
> + .vop_getpages_async = vop_stdgetpages_async,
> .vop_getwritemount =vop_stdgetwritemount,
> .vop_inactive = VOP_NULL,
> .vop_ioctl =VOP_ENOTTY,
> @@ -725,7 +727,17 @@ vop_stdgetpages(ap)
> {
>
> return vnode_pager_generic_getpages(ap->a_vp, ap->a_m,
> - ap->a_count, ap->a_reqpage);
> + ap->a_count, ap->a_reqpage, NULL, NULL);
> +}
> +
> +static int
> +vop_stdgetpages_async(struct vop_getpages_async_args *ap)
> +{
> + int error;
> +
> + error = VOP_GETPAGES(ap->a_vp, ap->a_m, ap->a_count,
> ap->a_reqpage);
> + ap->a_iodone(ap->a_arg, ap->a_m, ap->a_reqpage, error);
> + return (error);
> }
>
> int
>
> Modified: head/sys/kern/vnode_if.src
>
> ==
> --- head/sys/kern/vnode_if.src Sun Nov 23 10:26:28 2014(r274913)
> +++ head/sys/kern/vnode_if.src Sun Nov 23 12:01:52 2014(r274914)
> @@ -476,6 +476,19 @@ vop_getpages {
> };
>
>
> +%% getpages_async vp L L L
> +
> +vop_getpages_async {
> + IN struct vnode *vp;
> + IN vm_page_t *m;
> + IN int count;
> + IN int reqpage;
> + IN vm_ooffset_t offset;
> + IN vop_getpages_iodone_t *iodone;
> + IN void *arg;
> +};
> +
> +
> %% putpagesvp L L L
>
> vop_putpages {
>
> Modified: head/sys/sys/buf.h
>
> ==
> --- head/sys/sys/buf.h Sun Nov 23 10:26:28 2014(r274913)
> +++ head/sys/sys/buf.h Sun Nov 23 12:01:52 2014(r274914)
> @@ -107,7 +107,6 @@ struct buf {
> off_t b_offset; /* Offset into file. */
> TAILQ_ENTRY(buf) b_bobufs; /* (V) Buffer's associated vnode.
> */
> uint32_tb_vflags; /* (V) BV_* flags */
> - TAILQ_ENTRY(buf) b_freelist;/* (Q) Free list position
> inactive. */
> unsigned short b_qindex;/* (Q) buffer queue index */
> uint32_tb_flags;/* B_* flags. */
> b_xflags_t b_xflags;/* extra flags */
> @@ -124,9 +123,15 @@ struct buf {
> struct ucred *b_rcred; /* Read credentials reference. */
> struct ucred *b_wcred; /* Write credentials reference. */
> void*b_saveaddr;/* Original b_addr for physio. */
> - union pager_info {
> - int pg_reqpage;
> - } b_pager;
> + union {
> + TAILQ_ENTRY(buf) bu_freelist; /* (Q) */
> + struct {
> + void(*pg_iodone)(void *, vm_page_t *, int,
> int);
> + int pg_reqpage;
> + } bu_pager;
> + } b_union;
> +#defineb_freelist b_union.bu_freelist
> +#defineb_pager b_union.bu_pager
> union cluster_info {
> TAILQ_HEAD(cluster_list_head, buf) cluster_head;
> TAILQ_ENTRY(buf) cluster_en
svn commit: r274996 - head/share/mk
Author: bapt
Date: Mon Nov 24 23:58:04 2014
New Revision: 274996
URL: https://svnweb.freebsd.org/changeset/base/274996
Log:
s/cft/ctf
Modified:
head/share/mk/src.libnames.mk
Modified: head/share/mk/src.libnames.mk
==
--- head/share/mk/src.libnames.mk Mon Nov 24 23:29:56 2014
(r274995)
+++ head/share/mk/src.libnames.mk Mon Nov 24 23:58:04 2014
(r274996)
@@ -40,7 +40,7 @@ _LIBRARIES= \
cam \
capsicum \
casper \
- cft \
+ ctf \
com_err \
crypt \
crypto \
@@ -140,7 +140,7 @@ _DP_proc= supcplusplus
.endif
.endif
.if ${MK_CDDL} != "no"
-_DP_proc+= cft
+_DP_proc+= ctf
.endif
_DP_mp=crypto
_DP_memstat= kvm
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r274997 - head/share/mk
Author: bapt
Date: Tue Nov 25 00:01:53 2014
New Revision: 274997
URL: https://svnweb.freebsd.org/changeset/base/274997
Log:
Define special case for atf which libraries names are different from their
declaration
Modified:
head/share/mk/src.libnames.mk
Modified: head/share/mk/src.libnames.mk
==
--- head/share/mk/src.libnames.mk Mon Nov 24 23:58:04 2014
(r274996)
+++ head/share/mk/src.libnames.mk Tue Nov 25 00:01:53 2014
(r274997)
@@ -161,6 +161,8 @@ _DP_devstat=kvm
# Define spacial cases
LDADD_supcplusplus=-lsupc++
+LDADD_atf_c= -L${LIBATF_CDIR} -latf-c
+LDADD_atf_cxx= -L${LIBATF_CXXDIR} -latf-c++
.for _l in ${_LIBRARIES}
.if ${_PRIVATELIBS:M${_l}}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r274998 - head/usr.sbin/nmtree
Author: delphij
Date: Tue Nov 25 00:07:56 2014
New Revision: 274998
URL: https://svnweb.freebsd.org/changeset/base/274998
Log:
Fix build.
Modified:
head/usr.sbin/nmtree/Makefile
Modified: head/usr.sbin/nmtree/Makefile
==
--- head/usr.sbin/nmtree/Makefile Tue Nov 25 00:01:53 2014
(r274997)
+++ head/usr.sbin/nmtree/Makefile Tue Nov 25 00:07:56 2014
(r274998)
@@ -15,11 +15,7 @@ CFLAGS+= -I${.CURDIR}/../../contrib/mkno
.PATH: ${.CURDIR}/../../contrib/mknod
SRCS+= pack_dev.c
-CFLAGS+= -I${.CURDIR}/../../lib/libnetbsd
-LIBNETBSDDIR= ${.OBJDIR}/../../lib/libnetbsd
-LIBNETBSD= ${LIBNETBSDDIR}/libnetbsd.a
-DPADD+=${LIBNETBSD}
-LDADD+=${LIBNETBSD}
+LIBADD=netbsd
LINKS= ${BINDIR}/mtree ${BINDIR}/nmtree
MLINKS=mtree.8 nmtree.8
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r274999 - head/share/mk
Author: bapt
Date: Tue Nov 25 00:12:25 2014
New Revision: 274999
URL: https://svnweb.freebsd.org/changeset/base/274999
Log:
Do not overwrite any LIBNETBSD or LIBNETBSDDIR if they are already defined
Modified:
head/share/mk/src.libnames.mk
Modified: head/share/mk/src.libnames.mk
==
--- head/share/mk/src.libnames.mk Tue Nov 25 00:07:56 2014
(r274998)
+++ head/share/mk/src.libnames.mk Tue Nov 25 00:12:25 2014
(r274999)
@@ -259,5 +259,5 @@ LIBSMDIR= ${ROOTOBJDIR}/lib/libsm
LDSM?= ${LIBSMDIR}/libsm.a
LIBSM?=${LIBSMDIR}/libsm.a
-LIBNETBSDDIR= ${ROOTOBJDIR}/lib/libnetbsd
-LIBNETBSD= ${ROOTOBJDIR}/libnetbsd.a
+LIBNETBSDDIR?= ${ROOTOBJDIR}/lib/libnetbsd
+LIBNETBSD?=${ROOTOBJDIR}/libnetbsd.a
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r275000 - head/share/mk
Author: bapt
Date: Tue Nov 25 00:28:27 2014
New Revision: 275000
URL: https://svnweb.freebsd.org/changeset/base/275000
Log:
libatf-c++ exposes libatf-c abi hence we need to explicit link to atf-c if
atf-c++ is requested
Modified:
head/share/mk/src.libnames.mk
Modified: head/share/mk/src.libnames.mk
==
--- head/share/mk/src.libnames.mk Tue Nov 25 00:12:25 2014
(r274999)
+++ head/share/mk/src.libnames.mk Tue Nov 25 00:28:27 2014
(r275000)
@@ -188,6 +188,9 @@ LDADD_ucl+= ${LDADD_m}
DPADD_sqlite3+=${DPADD_pthread}
LDADD_sqlite3+=${LDADD_pthread}
+DPADD_atf_cxx+=${DPADD_atf_c}
+LDADD_atf_cxx+=${LDADD_atf_c}
+
.for _l in ${LIBADD}
.if ${_PRIVATELIBS:M${_l}}
USEPRIVATELIB+=${_l}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r275001 - head/share/mk
Author: bapt Date: Tue Nov 25 00:51:49 2014 New Revision: 275001 URL: https://svnweb.freebsd.org/changeset/base/275001 Log: libevent is an internallib Modified: head/share/mk/src.libnames.mk Modified: head/share/mk/src.libnames.mk == --- head/share/mk/src.libnames.mk Tue Nov 25 00:28:27 2014 (r275000) +++ head/share/mk/src.libnames.mk Tue Nov 25 00:51:49 2014 (r275001) @@ -23,6 +23,7 @@ _PRIVATELIBS= \ unbound _INTERNALIBS= \ + event \ mandoc \ netbsd \ ohash \ @@ -52,7 +53,6 @@ _LIBRARIES= \ dwarf \ edit \ elf \ - event \ execinfo \ fetch \ figpar \ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r275002 - head/usr.sbin/nmtree
Author: bapt
Date: Tue Nov 25 01:12:57 2014
New Revision: 275002
URL: https://svnweb.freebsd.org/changeset/base/275002
Log:
Fix the fix
Modified:
head/usr.sbin/nmtree/Makefile
Modified: head/usr.sbin/nmtree/Makefile
==
--- head/usr.sbin/nmtree/Makefile Tue Nov 25 00:51:49 2014
(r275001)
+++ head/usr.sbin/nmtree/Makefile Tue Nov 25 01:12:57 2014
(r275002)
@@ -15,6 +15,7 @@ CFLAGS+= -I${.CURDIR}/../../contrib/mkno
.PATH: ${.CURDIR}/../../contrib/mknod
SRCS+= pack_dev.c
+CFLAGS+= -I${.CURDIR}/../../lib/libnetbsd
LIBADD=netbsd
LINKS= ${BINDIR}/mtree ${BINDIR}/nmtree
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r275003 - head/sys/contrib/dev/ral
Author: kevlo
Date: Tue Nov 25 02:58:38 2014
New Revision: 275003
URL: https://svnweb.freebsd.org/changeset/base/275003
Log:
Add missing headers needed by write().
Modified:
head/sys/contrib/dev/ral/Makefile
Modified: head/sys/contrib/dev/ral/Makefile
==
--- head/sys/contrib/dev/ral/Makefile Tue Nov 25 01:12:57 2014
(r275002)
+++ head/sys/contrib/dev/ral/Makefile Tue Nov 25 02:58:38 2014
(r275003)
@@ -3,7 +3,8 @@
FILES= rt2561s.fw.uu rt2561.fw.uu rt2661.fw.uu rt2860.fw.uu
rt2561s.fw.uu: microcode.h LICENSE
- (echo '#include '; \
+ (echo '#include '; \
+echo '#include '; \
cat microcode.h; \
echo 'int main(void) { \
write(1, rt2561s, sizeof(rt2561s)); return 0; \
@@ -11,7 +12,8 @@ rt2561s.fw.uu: microcode.h LICENSE
(sed 's/^/# /' LICENSE; ./build | uuencode rt2561s.fw) > ${.TARGET}
rt2561.fw.uu: microcode.h LICENSE
- (echo '#include '; \
+ (echo '#include '; \
+echo '#include '; \
cat microcode.h; \
echo 'int main(void) { \
write(1, rt2561, sizeof(rt2561)); return 0; \
@@ -19,7 +21,8 @@ rt2561.fw.uu: microcode.h LICENSE
(sed 's/^/# /' LICENSE; ./build | uuencode rt2561.fw) > ${.TARGET}
rt2661.fw.uu: microcode.h LICENSE
- (echo '#include '; \
+ (echo '#include '; \
+echo '#include '; \
cat microcode.h; \
echo 'int main(void) { \
write(1, rt2661, sizeof(rt2661)); return 0; \
@@ -27,7 +30,8 @@ rt2661.fw.uu: microcode.h LICENSE
(sed 's/^/# /' LICENSE; ./build | uuencode rt2661.fw) > ${.TARGET}
rt2860.fw.uu: microcode.h LICENSE
- (echo '#include '; \
+ (echo '#include '; \
+echo '#include '; \
cat microcode.h; \
echo 'int main(void) { \
write(1, rt2860, sizeof(rt2860)); return 0; \
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r275004 - in head: lib/libc/gen lib/libc/include lib/libc/sys lib/libkiconv lib/libmd lib/libthr/thread lib/msun/src libexec/rtld-elf sys/amd64/include sys/arm/include sys/i386/include ...
Author: emaste
Date: Tue Nov 25 03:50:31 2014
New Revision: 275004
URL: https://svnweb.freebsd.org/changeset/base/275004
Log:
Revert r274772: it is not valid on MIPS
Reported by: sbruno
Modified:
head/lib/libc/gen/errlst.c
head/lib/libc/gen/isnan.c
head/lib/libc/gen/tls.c
head/lib/libc/include/errlst.h
head/lib/libc/sys/stack_protector.c
head/lib/libc/sys/stack_protector_compat.c
head/lib/libkiconv/quirks.c
head/lib/libkiconv/xlat16_iconv.c
head/lib/libkiconv/xlat16_sysctl.c
head/lib/libmd/rmd160c.c
head/lib/libmd/sha1c.c
head/lib/libthr/thread/thr_exit.c
head/lib/libthr/thread/thr_private.h
head/lib/msun/src/s_isnan.c
head/libexec/rtld-elf/rtld.c
head/sys/amd64/include/asm.h
head/sys/arm/include/asm.h
head/sys/i386/include/asm.h
head/sys/powerpc/include/asm.h
head/sys/powerpc/include/profile.h
head/sys/sparc64/include/asm.h
Modified: head/lib/libc/gen/errlst.c
==
--- head/lib/libc/gen/errlst.c Tue Nov 25 02:58:38 2014(r275003)
+++ head/lib/libc/gen/errlst.c Tue Nov 25 03:50:31 2014(r275004)
@@ -158,7 +158,7 @@ const char *const sys_errlist[] = {
};
const int sys_nerr = sizeof(sys_errlist) / sizeof(sys_errlist[0]);
-#ifdef __PIC__
+#ifdef PIC
__strong_reference(sys_errlist, __hidden_sys_errlist);
__strong_reference(sys_nerr, __hidden_sys_nerr);
#endif
Modified: head/lib/libc/gen/isnan.c
==
--- head/lib/libc/gen/isnan.c Tue Nov 25 02:58:38 2014(r275003)
+++ head/lib/libc/gen/isnan.c Tue Nov 25 03:50:31 2014(r275004)
@@ -40,7 +40,7 @@
* time, when calling both functions.
*/
-#ifdef __PIC__
+#ifdef PIC
__weak_reference(__isnan, isnan);
__weak_reference(__isnanf, isnanf);
@@ -61,4 +61,4 @@ __isnanf(float f)
u.f = f;
return (u.bits.exp == 255 && u.bits.man != 0);
}
-#endif /* __PIC__ */
+#endif /* PIC */
Modified: head/lib/libc/gen/tls.c
==
--- head/lib/libc/gen/tls.c Tue Nov 25 02:58:38 2014(r275003)
+++ head/lib/libc/gen/tls.c Tue Nov 25 03:50:31 2014(r275004)
@@ -78,7 +78,7 @@ void __libc_free_tls(void *tls, size_t t
#define TLS_VARIANT_II
#endif
-#ifndef __PIC__
+#ifndef PIC
#define round(size, align) \
(((size) + (align) - 1) & ~((align) - 1))
@@ -107,7 +107,7 @@ __libc_tls_get_addr(void *ti __unused)
return (0);
}
-#ifndef __PIC__
+#ifndef PIC
#ifdef TLS_VARIANT_I
@@ -264,14 +264,14 @@ __libc_free_tls(void *tcb __unused, size
{
}
-#endif /* __PIC__ */
+#endif /* PIC */
extern char **environ;
void
_init_tls()
{
-#ifndef __PIC__
+#ifndef PIC
Elf_Addr *sp;
Elf_Auxinfo *aux, *auxp;
Elf_Phdr *phdr;
Modified: head/lib/libc/include/errlst.h
==
--- head/lib/libc/include/errlst.h Tue Nov 25 02:58:38 2014
(r275003)
+++ head/lib/libc/include/errlst.h Tue Nov 25 03:50:31 2014
(r275004)
@@ -31,7 +31,7 @@
#include
-#ifdef __PIC__
+#ifdef PIC
/* If the main executable imports these, do not use its copy from libc.so. */
extern const char *const __hidden_sys_errlist[] __hidden;
extern const int __hidden_sys_nerr __hidden;
Modified: head/lib/libc/sys/stack_protector.c
==
--- head/lib/libc/sys/stack_protector.c Tue Nov 25 02:58:38 2014
(r275003)
+++ head/lib/libc/sys/stack_protector.c Tue Nov 25 03:50:31 2014
(r275004)
@@ -115,6 +115,6 @@ __chk_fail(void)
__fail("buffer overflow detected; terminated");
}
-#ifndef __PIC__
+#ifndef PIC
__weak_reference(__stack_chk_fail, __stack_chk_fail_local);
#endif
Modified: head/lib/libc/sys/stack_protector_compat.c
==
--- head/lib/libc/sys/stack_protector_compat.c Tue Nov 25 02:58:38 2014
(r275003)
+++ head/lib/libc/sys/stack_protector_compat.c Tue Nov 25 03:50:31 2014
(r275004)
@@ -8,7 +8,7 @@ __FBSDID("$FreeBSD$");
void __stack_chk_fail(void);
-#ifdef __PIC__
+#ifdef PIC
void
__stack_chk_fail_local_hidden(void)
{
Modified: head/lib/libkiconv/quirks.c
==
--- head/lib/libkiconv/quirks.c Tue Nov 25 02:58:38 2014(r275003)
+++ head/lib/libkiconv/quirks.c Tue Nov 25 03:50:31 2014(r275004)
@@ -31,7 +31,7 @@
* when statically linked.
*/
-#ifdef __PIC__
+#ifdef PIC
/*
* Why do we need quirks?
@@ -193,4 +193,4 @@ kiconv_quirkcs(const char* base __unused
return (base);
}
-#endif /* __PIC__ */
+#endif /* PIC */
Modified: head/lib/libkiconv/xlat16_iconv.c
==
svn commit: r275006 - head
Author: ngie Date: Tue Nov 25 05:25:12 2014 New Revision: 275006 URL: https://svnweb.freebsd.org/changeset/base/275006 Log: Remove cokane@ from MAINTAINERS for 3dfx(4)/tdfx(4) because their email addresses on file bounce (see r252463 for more details) Reviewed by: accounts (dhw) Modified: head/MAINTAINERS Modified: head/MAINTAINERS == --- head/MAINTAINERSTue Nov 25 05:14:39 2014(r275005) +++ head/MAINTAINERSTue Nov 25 05:25:12 2014(r275006) @@ -48,7 +48,6 @@ cd(4) ken Pre-commit review requested. pass(4)ken Pre-commit review requested. ch(4) ken Pre-commit review requested. em(4) jfv Pre-commit review requested. -tdfx(4)cokane Just keep me informed of changes, try not to break it. sendmail gshapiroPre-commit review requested. etc/mail gshapiroPre-commit review requested. Keep in sync with -STABLE. @@ -118,7 +117,6 @@ lib/libc/stdtimeedwin Heads-up apprec is maintained by a third party source. sbin/routedbms Pre-commit review; notify vendor at rhyolite.com isci(4)jimharris Pre-commit review requested. -3dfx cokane Pre-commit review preferred. cmxdan...@roe.ch Pre-commit review preferred. filemonobrien Pre-commit review preferred. sysdoc trhodes Pre-commit review preferred. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r275009 - head/sys/cam/ctl
Author: mav
Date: Tue Nov 25 06:11:05 2014
New Revision: 275009
URL: https://svnweb.freebsd.org/changeset/base/275009
Log:
Use ctl_set_success() instead of direct inlining.
MFC after:1 week
Modified:
head/sys/cam/ctl/ctl.c
head/sys/cam/ctl/ctl_backend_ramdisk.c
Modified: head/sys/cam/ctl/ctl.c
==
--- head/sys/cam/ctl/ctl.c Tue Nov 25 05:57:12 2014(r275008)
+++ head/sys/cam/ctl/ctl.c Tue Nov 25 06:11:05 2014(r275009)
@@ -5211,8 +5211,7 @@ ctl_scsi_release(struct ctl_scsiio *ctsi
mtx_unlock(&lun->lun_lock);
- ctsio->scsi_status = SCSI_STATUS_OK;
- ctsio->io_hdr.status = CTL_SUCCESS;
+ ctl_set_success(ctsio);
if (ctsio->io_hdr.flags & CTL_FLAG_ALLOCATED) {
free(ctsio->kern_data_ptr, M_CTL);
@@ -5299,8 +5298,7 @@ ctl_scsi_reserve(struct ctl_scsiio *ctsi
lun->flags |= CTL_LUN_RESERVED;
lun->res_idx = residx;
- ctsio->scsi_status = SCSI_STATUS_OK;
- ctsio->io_hdr.status = CTL_SUCCESS;
+ ctl_set_success(ctsio);
bailout:
mtx_unlock(&lun->lun_lock);
@@ -5610,8 +5608,7 @@ ctl_format(struct ctl_scsiio *ctsio)
lun->flags &= ~CTL_LUN_INOPERABLE;
mtx_unlock(&lun->lun_lock);
- ctsio->scsi_status = SCSI_STATUS_OK;
- ctsio->io_hdr.status = CTL_SUCCESS;
+ ctl_set_success(ctsio);
bailout:
if (ctsio->io_hdr.flags & CTL_FLAG_ALLOCATED) {
@@ -9600,9 +9597,7 @@ ctl_tur(struct ctl_scsiio *ctsio)
CTL_DEBUG_PRINT(("ctl_tur\n"));
- ctsio->scsi_status = SCSI_STATUS_OK;
- ctsio->io_hdr.status = CTL_SUCCESS;
-
+ ctl_set_success(ctsio);
ctl_done((union ctl_io *)ctsio);
return (CTL_RETVAL_COMPLETE);
Modified: head/sys/cam/ctl/ctl_backend_ramdisk.c
==
--- head/sys/cam/ctl/ctl_backend_ramdisk.c Tue Nov 25 05:57:12 2014
(r275008)
+++ head/sys/cam/ctl/ctl_backend_ramdisk.c Tue Nov 25 06:11:05 2014
(r275009)
@@ -250,7 +250,7 @@ ctl_backend_ramdisk_move_done(union ctl_
&be_lun->io_task);
return (0);
}
- io->io_hdr.status = CTL_SUCCESS;
+ ctl_set_success(&io->scsiio);
} else if ((io->io_hdr.port_status != 0)
&& ((io->io_hdr.flags & CTL_FLAG_ABORT) == 0)
&& ((io->io_hdr.status & CTL_STATUS_MASK) == CTL_STATUS_NONE)){
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r275010 - head/sys/dev/usb/controller
Author: jhibbits
Date: Tue Nov 25 06:15:00 2014
New Revision: 275010
URL: https://svnweb.freebsd.org/changeset/base/275010
Log:
Add Apple Intrepid USB controller ID.
MFC after:2 weeks
Modified:
head/sys/dev/usb/controller/ohci_pci.c
Modified: head/sys/dev/usb/controller/ohci_pci.c
==
--- head/sys/dev/usb/controller/ohci_pci.c Tue Nov 25 06:11:05 2014
(r275009)
+++ head/sys/dev/usb/controller/ohci_pci.c Tue Nov 25 06:15:00 2014
(r275010)
@@ -175,6 +175,8 @@ ohci_pci_match(device_t self)
case 0x0019106b:
return ("Apple KeyLargo USB controller");
+ case 0x003f106b:
+ return ("Apple KeyLargo/Intrepid USB controller");
default:
break;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r275011 - head/cddl/contrib/opensolaris/lib/libdtrace/common
Author: markj
Date: Tue Nov 25 06:43:17 2014
New Revision: 275011
URL: https://svnweb.freebsd.org/changeset/base/275011
Log:
The module load address always needs to be included when setting the dm_*_va
fields of dt_module_t. Previously, this was only done on architectures where
kernel modules have type ET_REL; this change fixes that. As a result, symbol
name resolution in the stack() action now works properly for kernel modules
on i386.
Reported by: Shrikanth Kamath
Tested by:Shrikanth Kamath
Discussed with: avg
MFC after:2 weeks
Modified:
head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c
Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c
==
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c Tue Nov
25 06:15:00 2014(r275010)
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c Tue Nov
25 06:43:17 2014(r275011)
@@ -1211,13 +1211,13 @@ dt_module_update(dtrace_hdl_t *dtp, stru
#if defined(__FreeBSD__)
if (sh.sh_size == 0)
continue;
- if (is_elf_obj && (sh.sh_type == SHT_PROGBITS ||
- sh.sh_type == SHT_NOBITS)) {
+ if (sh.sh_type == SHT_PROGBITS || sh.sh_type == SHT_NOBITS) {
alignmask = sh.sh_addralign - 1;
mapbase += alignmask;
mapbase &= ~alignmask;
sh.sh_addr = mapbase;
- dmp->dm_sec_offsets[elf_ndxscn(sp)] = sh.sh_addr;
+ if (is_elf_obj)
+ dmp->dm_sec_offsets[elf_ndxscn(sp)] =
sh.sh_addr;
mapbase += sh.sh_size;
}
#endif
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r275012 - head/cddl/contrib/opensolaris/lib/libdtrace/common
Author: markj
Date: Tue Nov 25 07:01:38 2014
New Revision: 275012
URL: https://svnweb.freebsd.org/changeset/base/275012
Log:
Adjust some checks missed in r274637, now that pi_rname can be NULL.
Additionally fix a misparenthesization in the same check, noticed while
fixing the first bug. This bug only appears to cause problems if the same
USDT probe appears twice within a static function.
X-MFC-With: r274637
Modified:
head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c
Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c
==
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.cTue Nov
25 06:43:17 2014(r275011)
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.cTue Nov
25 07:01:38 2014(r275012)
@@ -545,8 +545,9 @@ dt_probe_define(dt_provider_t *pvp, dt_p
for (pip = prp->pr_inst; pip != NULL; pip = pip->pi_next) {
if (strcmp(pip->pi_fname, fname) == 0 &&
- ((rname == NULL && pip->pi_rname[0] == '\0') ||
- (rname != NULL && strcmp(pip->pi_rname, rname)) == 0))
+ ((rname == NULL && pip->pi_rname == NULL) ||
+ (rname != NULL && pip->pi_rname != NULL &&
+ strcmp(pip->pi_rname, rname) == 0)))
break;
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r275014 - head/share/mk
Author: bapt
Date: Tue Nov 25 07:13:31 2014
New Revision: 275014
URL: https://svnweb.freebsd.org/changeset/base/275014
Log:
Add definitions of kerberos libraries
Modified:
head/share/mk/src.libnames.mk
Modified: head/share/mk/src.libnames.mk
==
--- head/share/mk/src.libnames.mk Tue Nov 25 07:12:32 2014
(r275013)
+++ head/share/mk/src.libnames.mk Tue Nov 25 07:13:31 2014
(r275014)
@@ -16,6 +16,7 @@ _PRIVATELIBS= \
atf_cxx \
bsdstat \
heimipcc \
+ heimipcs \
ldns \
sqlite3 \
ssh \
@@ -33,6 +34,7 @@ _INTERNALIBS= \
_LIBRARIES=\
${_PRIVATELIBS} \
${_INTERNALIBS} \
+ alias \
archive \
asn1 \
bsdxml \
@@ -58,11 +60,19 @@ _LIBRARIES= \
figpar \
geom \
gssapi \
+ hdb \
heimbase \
+ heimntlm \
+ heimsqlite \
hx509 \
ipsec \
jail \
+ kadm5clnt \
+ kadm5srv \
+ kafs5 \
+ kdc \
kiconv \
+ krb5 \
kvm \
krb5 \
l \
@@ -100,6 +110,7 @@ _LIBRARIES= \
ulog \
usb \
util \
+ vers \
wind \
wrap \
y \
@@ -191,6 +202,12 @@ LDADD_sqlite3+=${LDADD_pthread}
DPADD_atf_cxx+=${DPADD_atf_c}
LDADD_atf_cxx+=${LDADD_atf_c}
+# The following depends on libraries which are using pthread
+DPADD_hdb+=${DPADD_pthread}
+LDADD_hdb+=${LDADD_pthread}
+DPADD_kadm5srv+= ${DPADD_pthread}
+LDADD_kadm5srv+= ${LDADD_pthread}
+
.for _l in ${LIBADD}
.if ${_PRIVATELIBS:M${_l}}
USEPRIVATELIB+=${_l}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r274914 - in head/sys: kern sys ufs/ffs vm
On Mon, Nov 24, 2014 at 03:45:10PM -0800, Adrian Chadd wrote: A> Why'd you make it all a union in strict buf? To avoid growing it and emphasize that fields are mutuall exclusive. -- Totus tuus, Glebius. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r274914 - in head/sys: kern sys ufs/ffs vm
On Mon, Nov 24, 2014 at 09:16:20PM +, Ruslan Bukin wrote: R> On Mon, Nov 24, 2014 at 10:29:02PM +0300, Gleb Smirnoff wrote: R> > On Mon, Nov 24, 2014 at 06:03:56PM +, Ruslan Bukin wrote: R> > R> > I this on stock kernel or on kernel with your modifications ? R> > R> R> > R> Stock one. I also checked with no virtio but MDROOT - same problems. R> > R> > I could expect a panic with a damaged 'struct buf', but not vm_page. R> > R> > Can you please do a clean build pre-r274914, and then again a clean R> > build of r274914, and then confirm that the former is stable, but the R> > latter panics? R> R> Yes, I just proceeded re-check both builds with removing obj dir each time and I still see the problem starting with r274914. R> R> Also restoring files like that on latest head makes things happy (no panics): R> svnlite up -r274913 sys/kern/vfs_default.c sys/kern/vnode_if.src sys/sys/buf.h sys/sys/vnode.h sys/ufs/ffs/ffs_vnops.c sys/vm/swap_pager.c sys/vm/vm_pager.h sys/vm/vnode_pager.c sys/vm/vnode_pager.h Can you please try to un-union the struct buf and see if it helps? -- Totus tuus, Glebius. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r275017 - head/share/mk
Author: bapt
Date: Tue Nov 25 07:47:44 2014
New Revision: 275017
URL: https://svnweb.freebsd.org/changeset/base/275017
Log:
Fix make depends with libnetbsd
Modified:
head/share/mk/src.libnames.mk
Modified: head/share/mk/src.libnames.mk
==
--- head/share/mk/src.libnames.mk Tue Nov 25 07:30:26 2014
(r275016)
+++ head/share/mk/src.libnames.mk Tue Nov 25 07:47:44 2014
(r275017)
@@ -280,4 +280,4 @@ LDSM?= ${LIBSMDIR}/libsm.a
LIBSM?=${LIBSMDIR}/libsm.a
LIBNETBSDDIR?= ${ROOTOBJDIR}/lib/libnetbsd
-LIBNETBSD?=${ROOTOBJDIR}/libnetbsd.a
+LIBNETBSD?=${LIBNETBSDDIR}/libnetbsd.a
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
