Re: svn commit: r366381 - head/sys/modules/pwm
In message <50246694-58eb-0a68-7c9f-309ae2777...@freebsd.org>, Jung-uk Kim writ
es:
>
> On 20. 10. 3., Cy Schubert wrote:
> > In message c
> > om>
> > , Mateusz Guzik writes:
> >> On 10/2/20, Emmanuel Vadot wrote:
> >>> Author: manu
> >>> Date: Fri Oct 2 19:56:54 2020
> >>> New Revision: 366381
> >>> URL: https://svnweb.freebsd.org/changeset/base/366381
> >>>
> >>> Log:
> >>> pwm_backlight: Restrict module to armv7 and aarch64
> >>>
> >>> Both powerpc64 and riscv uses fdt but don't use EXT_RESOURCES.
> >>>
> >>> Reported by:jenkins
> >>>
> >>> Modified:
> >>> head/sys/modules/pwm/Makefile
> >>>
> >>> Modified: head/sys/modules/pwm/Makefile
> >>> =
> ==
> >> ===
> >>> --- head/sys/modules/pwm/Makefile Fri Oct 2 19:16:06 2020(r36638
> >> 0)
> >>> +++ head/sys/modules/pwm/Makefile Fri Oct 2 19:56:54 2020(r36638
> >> 1)
> >>> @@ -6,8 +6,10 @@ SUBDIR = \
> >>> pwmbus \
> >>> pwmc \
> >>>
> >>> +.if ${MACHINE_ARCH} == "armv7" || ${MACHINE_ARCH} == "aarch64"
> >>> .if !empty(OPT_FDT)
> >>> SUBDIR += pwm_backlight
> >>> +.endif
> >>> .endif
> >>>
> >>> .include
> >>
> >> I don't know which commits are to blame, but the following is broken
> >> in tinderbox:
> >> arm GENERIC kernel failed, check _.arm.GENERIC for details
> >> arm GENERIC-NODEBUG kernel failed, check _.arm.GENERIC-NODEBUG for details
> >> arm TEGRA124 kernel failed, check _.arm.TEGRA124 for details
> >> arm ARMADA38X kernel failed, check _.arm.ARMADA38X for details
> >> arm VYBRID kernel failed, check _.arm.VYBRID for details
> >> arm GENERIC-MMCCAM kernel failed, check _.arm.GENERIC-MMCCAM for details
> >> arm LINT kernel failed, check _.arm.LINT for details
> >> arm IMX53 kernel failed, check _.arm.IMX53 for details
> >> arm IMX6 kernel failed, check _.arm.IMX6 for details
> >> arm EFIKA_MX kernel failed, check _.arm.EFIKA_MX for details
> >> arm ZEDBOARD kernel failed, check _.arm.ZEDBOARD for details
> >
> > And on amd64 my laptop is useless now.
> >
> > Oct 2 18:23:58 slippy kernel: link_elf_obj: symbol
> > acpi_video_get_backlight_type undefined
> > Oct 2 18:23:58 slippy kernel: Warning: memory type debugfsint leaked
> > memory on destroy (2 allocations, 80 bytes leaked).
> > Oct 2 18:23:59 slippy kernel: linker_load_file: /boot/modules/i915kms.ko -
>
> > unsupported file type
> >
> > And this is also after updating drm-current-kmod.
>
> Create files directory, add the attached patch there, and try again.
>
> Jung-uk Kim
>
>
> --- drivers/gpu/drm/i915/display/intel_opregion.c.orig2020-10-02 18:5
> 0:12 UTC
> +++ drivers/gpu/drm/i915/display/intel_opregion.c
> @@ -25,6 +25,8 @@
> *
> */
>
> +#include
> +
> #include
> #include
> #include
> @@ -450,10 +452,12 @@ static u32 asle_set_backlight(struct drm_i915_private
>
> DRM_DEBUG_DRIVER("bclp = 0x%08x\n", bclp);
>
> +#if __FreeBSD_version < 1300118
> if (acpi_video_get_backlight_type() == acpi_backlight_native) {
> DRM_DEBUG_KMS("opregion backlight request ignored\n");
> return 0;
> }
> +#endif
>
> if (!(bclp & ASLE_BCLP_VALID))
> return ASLC_BACKLIGHT_FAILED;
>
This won't work. The machine is already at 1300118.
I'll try a #if 0 instead.
(I restored a zfs snapshot of /usr/src and /usr/obj.)
Cheers,
Cy Schubert
FreeBSD UNIX: Web: https://FreeBSD.org
NTP: Web: https://nwtime.org
The need of the many outweighs the greed of the few.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366386 - head/sys/dev/pwm
Author: manu
Date: Sat Oct 3 08:31:28 2020
New Revision: 366386
URL: https://svnweb.freebsd.org/changeset/base/366386
Log:
pwm_backlight: Fix 32 bits build
Reported by: jenkins, mjg
Modified:
head/sys/dev/pwm/pwm_backlight.c
Modified: head/sys/dev/pwm/pwm_backlight.c
==
--- head/sys/dev/pwm/pwm_backlight.cSat Oct 3 02:26:38 2020
(r366385)
+++ head/sys/dev/pwm/pwm_backlight.cSat Oct 3 08:31:28 2020
(r366386)
@@ -141,8 +141,8 @@ pwm_backlight_attach(device_t dev)
if (bootverbose) {
device_printf(dev, "Number of levels: %zd\n",
sc->nlevels);
- device_printf(dev, "Configured period time: %lu\n",
sc->channel->period);
- device_printf(dev, "Default duty cycle: %lu\n",
sc->channel->duty);
+ device_printf(dev, "Configured period time: %ju\n",
(uintmax_t)sc->channel->period);
+ device_printf(dev, "Default duty cycle: %ju\n",
(uintmax_t)sc->channel->duty);
}
} else {
/* Get the current backlight level */
@@ -153,8 +153,8 @@ pwm_backlight_attach(device_t dev)
if (sc->channel->duty > sc->channel->period)
sc->channel->duty = sc->channel->period;
if (bootverbose) {
- device_printf(dev, "Configured period time: %lu\n",
sc->channel->period);
- device_printf(dev, "Default duty cycle: %lu\n",
sc->channel->duty);
+ device_printf(dev, "Configured period time: %ju\n",
(uintmax_t)sc->channel->period);
+ device_printf(dev, "Default duty cycle: %ju\n",
(uintmax_t)sc->channel->duty);
}
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r366381 - head/sys/modules/pwm
On Fri, 02 Oct 2020 21:12:01 -0700
Cy Schubert wrote:
> In message om>
> , Mateusz Guzik writes:
> > On 10/2/20, Emmanuel Vadot wrote:
> > > Author: manu
> > > Date: Fri Oct 2 19:56:54 2020
> > > New Revision: 366381
> > > URL: https://svnweb.freebsd.org/changeset/base/366381
> > >
> > > Log:
> > > pwm_backlight: Restrict module to armv7 and aarch64
> > >
> > > Both powerpc64 and riscv uses fdt but don't use EXT_RESOURCES.
> > >
> > > Reported by:jenkins
> > >
> > > Modified:
> > > head/sys/modules/pwm/Makefile
> > >
> > > Modified: head/sys/modules/pwm/Makefile
> > > ===
> > ===
> > > --- head/sys/modules/pwm/Makefile Fri Oct 2 19:16:06 2020(r36638
> > 0)
> > > +++ head/sys/modules/pwm/Makefile Fri Oct 2 19:56:54 2020(r36638
> > 1)
> > > @@ -6,8 +6,10 @@ SUBDIR = \
> > > pwmbus \
> > > pwmc \
> > >
> > > +.if ${MACHINE_ARCH} == "armv7" || ${MACHINE_ARCH} == "aarch64"
> > > .if !empty(OPT_FDT)
> > > SUBDIR += pwm_backlight
> > > +.endif
> > > .endif
> > >
> > > .include
> >
> > I don't know which commits are to blame, but the following is broken
> > in tinderbox:
> > arm GENERIC kernel failed, check _.arm.GENERIC for details
> > arm GENERIC-NODEBUG kernel failed, check _.arm.GENERIC-NODEBUG for details
> > arm TEGRA124 kernel failed, check _.arm.TEGRA124 for details
> > arm ARMADA38X kernel failed, check _.arm.ARMADA38X for details
> > arm VYBRID kernel failed, check _.arm.VYBRID for details
> > arm GENERIC-MMCCAM kernel failed, check _.arm.GENERIC-MMCCAM for details
> > arm LINT kernel failed, check _.arm.LINT for details
> > arm IMX53 kernel failed, check _.arm.IMX53 for details
> > arm IMX6 kernel failed, check _.arm.IMX6 for details
> > arm EFIKA_MX kernel failed, check _.arm.EFIKA_MX for details
> > arm ZEDBOARD kernel failed, check _.arm.ZEDBOARD for details
>
> And on amd64 my laptop is useless now.
>
> Oct 2 18:23:58 slippy kernel: link_elf_obj: symbol
> acpi_video_get_backlight_type undefined
> Oct 2 18:23:58 slippy kernel: Warning: memory type debugfsint leaked
> memory on destroy (2 allocations, 80 bytes leaked).
> Oct 2 18:23:59 slippy kernel: linker_load_file: /boot/modules/i915kms.ko -
> unsupported file type
>
> And this is also after updating drm-current-kmod.
>
>
> --
> Cheers,
> Cy Schubert
> FreeBSD UNIX: Web: https://FreeBSD.org
> NTP: Web: https://nwtime.org
>
> The need of the many outweighs the greed of the few.
>
>
Fixed in ports r551266, sorry.
--
Emmanuel Vadot
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r366381 - head/sys/modules/pwm
On Sat, 3 Oct 2020 05:47:22 +0200
Mateusz Guzik wrote:
> On 10/2/20, Emmanuel Vadot wrote:
> > Author: manu
> > Date: Fri Oct 2 19:56:54 2020
> > New Revision: 366381
> > URL: https://svnweb.freebsd.org/changeset/base/366381
> >
> > Log:
> > pwm_backlight: Restrict module to armv7 and aarch64
> >
> > Both powerpc64 and riscv uses fdt but don't use EXT_RESOURCES.
> >
> > Reported by: jenkins
> >
> > Modified:
> > head/sys/modules/pwm/Makefile
> >
> > Modified: head/sys/modules/pwm/Makefile
> > ==
> > --- head/sys/modules/pwm/Makefile Fri Oct 2 19:16:06 2020
> > (r366380)
> > +++ head/sys/modules/pwm/Makefile Fri Oct 2 19:56:54 2020
> > (r366381)
> > @@ -6,8 +6,10 @@ SUBDIR = \
> > pwmbus \
> > pwmc \
> >
> > +.if ${MACHINE_ARCH} == "armv7" || ${MACHINE_ARCH} == "aarch64"
> > .if !empty(OPT_FDT)
> > SUBDIR += pwm_backlight
> > +.endif
> > .endif
> >
> > .include
>
> I don't know which commits are to blame, but the following is broken
> in tinderbox:
> arm GENERIC kernel failed, check _.arm.GENERIC for details
> arm GENERIC-NODEBUG kernel failed, check _.arm.GENERIC-NODEBUG for details
> arm TEGRA124 kernel failed, check _.arm.TEGRA124 for details
> arm ARMADA38X kernel failed, check _.arm.ARMADA38X for details
> arm VYBRID kernel failed, check _.arm.VYBRID for details
> arm GENERIC-MMCCAM kernel failed, check _.arm.GENERIC-MMCCAM for details
> arm LINT kernel failed, check _.arm.LINT for details
> arm IMX53 kernel failed, check _.arm.IMX53 for details
> arm IMX6 kernel failed, check _.arm.IMX6 for details
> arm EFIKA_MX kernel failed, check _.arm.EFIKA_MX for details
> arm ZEDBOARD kernel failed, check _.arm.ZEDBOARD for details
>
> --
> Mateusz Guzik
This is fixed now, sorry.
--
Emmanuel Vadot
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366387 - head/tools/tools/netmap
Author: vmaffione
Date: Sat Oct 3 09:23:34 2020
New Revision: 366387
URL: https://svnweb.freebsd.org/changeset/base/366387
Log:
netmap: pkt-gen: minor corrections to documentation
Submitted by: Brian Poole
MFC after:3 days
Modified:
head/tools/tools/netmap/pkt-gen.8
head/tools/tools/netmap/pkt-gen.c
Modified: head/tools/tools/netmap/pkt-gen.8
==
--- head/tools/tools/netmap/pkt-gen.8 Sat Oct 3 08:31:28 2020
(r366386)
+++ head/tools/tools/netmap/pkt-gen.8 Sat Oct 3 09:23:34 2020
(r366387)
@@ -95,7 +95,7 @@ for server-side ping-pong operation.
.It Fl n Ar count
Number of iterations of the
.Nm
-function, with 0 meaning infinite).
+function (with 0 meaning infinite).
In case of
.Cm tx
or
@@ -147,10 +147,10 @@ is larger than one, each thread handles a single TX ri
.Cm tx
mode), a single RX ring (in
.Cm rx
-mode), or a TX/RX ring couple.
+mode), or a TX/RX ring pair.
The number of
.Ar threads
-must be less or equal than the number of TX (or RX) ring available
+must be less than or equal to the number of TX (or RX) ring available
in the device specified by
.Ar interface .
.It Fl T Ar report_ms
@@ -158,7 +158,7 @@ Number of milliseconds between reports.
.It Fl w Ar wait_for_link_time
Number of seconds to wait before starting the
.Nm
-function, useuful to make sure that the network link is up.
+function, useful to make sure that the network link is up.
A network device driver may take some time to enter netmap mode, or
to create a new transmit/receive ring pair when
.Xr netmap 4
@@ -168,7 +168,7 @@ Packet transmission rate.
Not setting the packet transmission rate tells
.Nm
to transmit packets as quickly as possible.
-On servers from 2010 on-wards
+On servers from 2010 onward
.Xr netmap 4
is able to completely use all of the bandwidth of a 10 or 40Gbps link,
so this option should be used unless your intention is to saturate the link.
@@ -231,7 +231,7 @@ This adds 4 bytes of CRC and 20 bytes of framing to ea
.It Fl C Ar tx_slots Ns Oo Cm \&, Ns Ar rx_slots Ns Oo Cm \&, Ns Ar tx_rings
Ns Oo Cm \&, Ns Ar rx_rings Oc Oc Oc
Configuration in terms of number of rings and slots to be used when
opening the netmap port.
-Such configuration has effect on software ports
+Such configuration has an effect on software ports
created on the fly, such as VALE ports and netmap pipes.
The configuration may consist of 1 to 4 numbers separated by commas:
.Dq tx_slots,rx_slots,tx_rings,rx_rings .
Modified: head/tools/tools/netmap/pkt-gen.c
==
--- head/tools/tools/netmap/pkt-gen.c Sat Oct 3 08:31:28 2020
(r366386)
+++ head/tools/tools/netmap/pkt-gen.c Sat Oct 3 09:23:34 2020
(r366387)
@@ -275,7 +275,7 @@ struct glob_arg {
#define OPT_TS 16 /* add a timestamp */
#define OPT_INDIRECT 32 /* use indirect buffers, tx only */
#define OPT_DUMP 64 /* dump rx/tx traffic */
-#define OPT_RUBBISH256 /* send wathever the buffers contain */
+#define OPT_RUBBISH256 /* send whatever the buffers contain */
#define OPT_RANDOM_SRC 512
#define OPT_RANDOM_DST 1024
#define OPT_PPS_STATS 2048
@@ -2360,7 +2360,7 @@ usage(int errcode)
" for client-side ping-pong operation, and pong for server-side
ping-pong operation.\n"
"\n"
" -n count\n"
-" Number of iterations of the pkt-gen function, with 0 meaning
infinite). In case of tx or rx,\n"
+" Number of iterations of the pkt-gen function (with 0 meaning
infinite). In case of tx or rx,\n"
" count is the number of packets to receive or transmit. In case
of ping or pong, count is the\n"
" number of ping-pong transactions.\n"
"\n"
@@ -2397,20 +2397,20 @@ usage(int errcode)
" -p threads\n"
" Number of threads to use. By default, only a single thread is
used to handle all the netmap\n"
" rings. If threads is larger than one, each thread handles a
single TX ring (in tx mode), a\n"
-" single RX ring (in rx mode), or a TX/RX ring couple. The number
of threads must be less or\n"
-" equal than the number of TX (or RX) ring available in the device
specified by interface.\n"
+" single RX ring (in rx mode), or a TX/RX ring pair. The number
of threads must be less than or\n"
+" equal to the number of TX (or RX) rings available in the device
specified by interface.\n"
"\n"
" -T report_ms\n"
" Number of milliseconds between reports.\n"
"\n"
" -w wait_for_link_time\n"
-" Number of seconds to wait before starting the pkt-gen function,
useuful to make sure that the\n"
+" Number of seconds to wait before starting the pkt-gen function,
useful to make sure that the\n"
" network link is up. A network device driv
svn commit: r366388 - head/sys/net
Author: vmaffione
Date: Sat Oct 3 09:33:29 2020
New Revision: 366388
URL: https://svnweb.freebsd.org/changeset/base/366388
Log:
netmap: fix constness warnings generated by "-Wcast-qual"
Submitted by: milosz.kaniew...@gmail.com
MFC after:3 days
Modified:
head/sys/net/netmap_user.h
Modified: head/sys/net/netmap_user.h
==
--- head/sys/net/netmap_user.h Sat Oct 3 09:23:34 2020(r366387)
+++ head/sys/net/netmap_user.h Sat Oct 3 09:33:29 2020(r366388)
@@ -290,7 +290,7 @@ struct nm_desc {
* when the descriptor is open correctly, d->self == d
* Eventually we should also use some magic number.
*/
-#define P2NMD(p) ((struct nm_desc *)(p))
+#define P2NMD(p) ((const struct nm_desc *)(p))
#define IS_NETMAP_DESC(d) ((d) && P2NMD(d)->self == P2NMD(d))
#define NETMAP_FD(d) (P2NMD(d)->fd)
@@ -616,7 +616,7 @@ nm_parse(const char *ifname, struct nm_desc *d, char *
const char *vpname = NULL;
u_int namelen;
uint32_t nr_ringid = 0, nr_flags;
- char errmsg[MAXERRMSG] = "";
+ char errmsg[MAXERRMSG] = "", *tmp;
long num;
uint16_t nr_arg2 = 0;
enum { P_START, P_RNGSFXOK, P_GETNUM, P_FLAGS, P_FLAGSOK, P_MEMID }
p_state;
@@ -713,12 +713,13 @@ nm_parse(const char *ifname, struct nm_desc *d, char *
port++;
break;
case P_GETNUM:
- num = strtol(port, (char **)&port, 10);
+ num = strtol(port, &tmp, 10);
if (num < 0 || num >= NETMAP_RING_MASK) {
snprintf(errmsg, MAXERRMSG, "'%ld' out of range
[0, %d)",
num, NETMAP_RING_MASK);
goto fail;
}
+ port = tmp;
nr_ringid = num & NETMAP_RING_MASK;
p_state = P_RNGSFXOK;
break;
@@ -760,11 +761,12 @@ nm_parse(const char *ifname, struct nm_desc *d, char *
snprintf(errmsg, MAXERRMSG, "double setting of
memid");
goto fail;
}
- num = strtol(port, (char **)&port, 10);
+ num = strtol(port, &tmp, 10);
if (num <= 0) {
snprintf(errmsg, MAXERRMSG, "invalid memid %ld,
must be >0", num);
goto fail;
}
+ port = tmp;
nr_arg2 = num;
p_state = P_RNGSFXOK;
break;
@@ -1044,7 +1046,7 @@ nm_inject(struct nm_desc *d, const void *buf, size_t s
ring->slot[i].flags = NS_MOREFRAG;
nm_pkt_copy(buf, NETMAP_BUF(ring, idx),
ring->nr_buf_size);
i = nm_ring_next(ring, i);
- buf = (char *)buf + ring->nr_buf_size;
+ buf = (const char *)buf + ring->nr_buf_size;
}
idx = ring->slot[i].buf_idx;
ring->slot[i].len = rem;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366389 - in head: share/man/man4 tools/tools/netmap
Author: vmaffione
Date: Sat Oct 3 09:36:33 2020
New Revision: 366389
URL: https://svnweb.freebsd.org/changeset/base/366389
Log:
netmap: minor documentation fix
Also update date of pkt-gen.8 (not done in r366387).
Submitted by: milosz.kaniew...@gmail.com
MFC after:3 days
Modified:
head/share/man/man4/netmap.4
head/tools/tools/netmap/pkt-gen.8
Modified: head/share/man/man4/netmap.4
==
--- head/share/man/man4/netmap.4Sat Oct 3 09:33:29 2020
(r366388)
+++ head/share/man/man4/netmap.4Sat Oct 3 09:36:33 2020
(r366389)
@@ -27,7 +27,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd February 6, 2020
+.Dd October 3, 2020
.Dt NETMAP 4
.Os
.Sh NAME
@@ -1052,7 +1052,7 @@ void receiver(void)
for (;;) {
poll(&fds, 1, -1);
while ( (buf = nm_nextpkt(d, &h)) )
- consume_pkt(buf, h->len);
+ consume_pkt(buf, h.len);
}
nm_close(d);
}
Modified: head/tools/tools/netmap/pkt-gen.8
==
--- head/tools/tools/netmap/pkt-gen.8 Sat Oct 3 09:33:29 2020
(r366388)
+++ head/tools/tools/netmap/pkt-gen.8 Sat Oct 3 09:36:33 2020
(r366389)
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 31, 2018
+.Dd October 3, 2020
.Dt PKT-GEN 8
.Os
.Sh NAME
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366390 - in head: sys/conf sys/net sys/net/route sys/netinet sys/netinet6 sys/sys usr.bin/netstat
Author: melifaro Date: Sat Oct 3 10:47:17 2020 New Revision: 366390 URL: https://svnweb.freebsd.org/changeset/base/366390 Log: Introduce scalable route multipath. This change is based on the nexthop objects landed in D24232. The change introduces the concept of nexthop groups. Each group contains the collection of nexthops with their relative weights and a dataplane-optimized structure to enable efficient nexthop selection. Simular to the nexthops, nexthop groups are immutable. Dataplane part gets compiled during group creation and is basically an array of nexthop pointers, compiled w.r.t their weights. With this change, `rt_nhop` field of `struct rtentry` contains either nexthop or nexthop group. They are distinguished by the presense of NHF_MULTIPATH flag. All dataplane lookup functions returns pointer to the nexthop object, leaving nexhop groups details inside routing subsystem. User-visible changes: The change is intended to be backward-compatible: all non-mpath operations should work as before with ROUTE_MPATH and net.route.multipath=1. All routes now comes with weight, default weight is 1, maximum is 2^24-1. Current maximum multipath group width is statically set to 64. This will become sysctl-tunable in the followup changes. Using functionality: * Recompile kernel with ROUTE_MPATH * set net.route.multipath to 1 route add -6 2001:db8::/32 2001:db8::2 -weight 10 route add -6 2001:db8::/32 2001:db8::3 -weight 20 netstat -6On Nexthop groups data Internet6: GrpIdx NhIdx Weight Slots Gateway Netif Refcnt 1 --- --- --- --- - 1 13 10 1 2001:db8::2 vlan2 14 20 2 2001:db8::3 vlan2 Next steps: * Land outbound hashing for locally-originated routes ( D26523 ). * Fix net/bird multipath (net/frr seems to work fine) * Add ROUTE_MPATH to GENERIC * Set net.route.multipath=1 by default Tested by:olivier Reviewed by: glebius Relnotes: yes Differential Revision:https://reviews.freebsd.org/D26449 Added: head/sys/net/route/mpath_ctl.c (contents, props changed) head/sys/net/route/nhgrp.c (contents, props changed) head/sys/net/route/nhgrp_ctl.c (contents, props changed) head/sys/net/route/nhgrp_var.h (contents, props changed) head/usr.bin/netstat/nhgrp.c (contents, props changed) Modified: head/sys/conf/NOTES head/sys/conf/files head/sys/conf/options head/sys/net/radix.c head/sys/net/route.c head/sys/net/route.h head/sys/net/route/nhop.c head/sys/net/route/nhop.h head/sys/net/route/nhop_ctl.c head/sys/net/route/nhop_var.h head/sys/net/route/route_ctl.c head/sys/net/route/route_ctl.h head/sys/net/route/route_helpers.c head/sys/net/route/route_var.h head/sys/net/rtsock.c head/sys/netinet/in.c head/sys/netinet/in_fib.c head/sys/netinet/in_rmx.c head/sys/netinet/ip_output.c head/sys/netinet6/in6_fib.c head/sys/netinet6/in6_rmx.c head/sys/netinet6/nd6.c head/sys/sys/socket.h head/usr.bin/netstat/Makefile head/usr.bin/netstat/common.h head/usr.bin/netstat/main.c head/usr.bin/netstat/netstat.h head/usr.bin/netstat/nhops.c Modified: head/sys/conf/NOTES == --- head/sys/conf/NOTES Sat Oct 3 09:36:33 2020(r366389) +++ head/sys/conf/NOTES Sat Oct 3 10:47:17 2020(r366390) @@ -1002,7 +1002,7 @@ devicelagg # # TCP_HHOOK enables the hhook(9) framework hooks for the TCP stack. # -# RADIX_MPATH provides support for equal-cost multi-path routing. +# ROUTE_MPATH provides support for multipath routing. # optionsMROUTING# Multicast routing optionsIPFIREWALL #firewall @@ -1023,7 +1023,7 @@ options TCPDEBUG optionsTCPPCAP optionsTCP_BLACKBOX optionsTCP_HHOOK -optionsRADIX_MPATH +optionsROUTE_MPATH # The MBUF_STRESS_TEST option enables options which create # various random failures / extreme cases related to mbuf Modified: head/sys/conf/files == --- head/sys/conf/files Sat Oct 3 09:36:33 2020(r366389) +++ head/sys/conf/files Sat Oct 3 10:47:17 2020(r366390) @@ -4143,10 +4143,12 @@ net/debugnet.c optional inet debugnet net/debugnet_inet.coptional inet debugnet net/pfil.c optional ether | inet net/radix.cstandard -net/radix_mpath.c standard net/raw_cb.c standard net/raw_usrreq.c standard net/route.cstandard +net/route/mpath_ctl.c optional route_mpath +ne
svn commit: r366391 - head/sys/kern
Author: trasz Date: Sat Oct 3 12:03:08 2020 New Revision: 366391 URL: https://svnweb.freebsd.org/changeset/base/366391 Log: Move KTRUSERRET() from userret() to ast(). It's a really long detour - it writes ktrace entries to the filesystem - so the overhead of ast() won't make any difference. Reviewed by: kib Sponsored by: DARPA Differential Revision:https://reviews.freebsd.org/D26404 Modified: head/sys/kern/kern_ktrace.c head/sys/kern/subr_trap.c Modified: head/sys/kern/kern_ktrace.c == --- head/sys/kern/kern_ktrace.c Sat Oct 3 10:47:17 2020(r366390) +++ head/sys/kern/kern_ktrace.c Sat Oct 3 12:03:08 2020(r366391) @@ -347,6 +347,9 @@ ktr_enqueuerequest(struct thread *td, struct ktr_reque mtx_lock(&ktrace_mtx); STAILQ_INSERT_TAIL(&td->td_proc->p_ktr, req, ktr_list); mtx_unlock(&ktrace_mtx); + thread_lock(td); + td->td_flags |= TDF_ASTPENDING; + thread_unlock(td); } /* Modified: head/sys/kern/subr_trap.c == --- head/sys/kern/subr_trap.c Sat Oct 3 10:47:17 2020(r366390) +++ head/sys/kern/subr_trap.c Sat Oct 3 12:03:08 2020(r366391) @@ -130,9 +130,6 @@ userret(struct thread *td, struct trapframe *frame) PROC_UNLOCK(p); } #endif -#ifdef KTRACE - KTRUSERRET(td); -#endif /* * Charge system time if profiling. @@ -340,6 +337,10 @@ ast(struct trapframe *framep) */ if (td->td_pflags & TDP_SIGFASTPENDING) sigfastblock_setpend(td, false); + +#ifdef KTRACE + KTRUSERRET(td); +#endif /* * We need to check to see if we have to exit or wait due to a ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r366390 - in head: sys/conf sys/net sys/net/route sys/netinet sys/netinet6 sys/sys usr.bin/netstat
This gives me: /tank/users/mjg/src/freebsd/sys/net/route/route_ctl.c:94:13: warning: unused function 'rib_can_multipath' [-Wunused-function] static bool rib_can_multipath(struct rib_head *rh); ^ /tank/users/mjg/src/freebsd/sys/net/rtsock.c:851:1: warning: unused function 'save_del_notification' [-Wunused-function] save_del_notification(struct rib_cmd_info *rc, void *_cbdata) ^ /tank/users/mjg/src/freebsd/sys/net/rtsock.c:860:1: warning: unused function 'save_add_notification' [-Wunused-function] save_add_notification(struct rib_cmd_info *rc, void *_cbdata) ^ On 10/3/20, Alexander V. Chernikov wrote: > Author: melifaro > Date: Sat Oct 3 10:47:17 2020 > New Revision: 366390 > URL: https://svnweb.freebsd.org/changeset/base/366390 > > Log: > Introduce scalable route multipath. > > This change is based on the nexthop objects landed in D24232. > > The change introduces the concept of nexthop groups. > Each group contains the collection of nexthops with their >relative weights and a dataplane-optimized structure to enable >efficient nexthop selection. > > Simular to the nexthops, nexthop groups are immutable. Dataplane part >gets compiled during group creation and is basically an array of >nexthop pointers, compiled w.r.t their weights. > > With this change, `rt_nhop` field of `struct rtentry` contains either >nexthop or nexthop group. They are distinguished by the presense of >NHF_MULTIPATH flag. > All dataplane lookup functions returns pointer to the nexthop object, > leaving nexhop groups details inside routing subsystem. > > User-visible changes: > > The change is intended to be backward-compatible: all non-mpath > operations >should work as before with ROUTE_MPATH and net.route.multipath=1. > > All routes now comes with weight, default weight is 1, maximum is 2^24-1. > > Current maximum multipath group width is statically set to 64. >This will become sysctl-tunable in the followup changes. > > Using functionality: > * Recompile kernel with ROUTE_MPATH > * set net.route.multipath to 1 > > route add -6 2001:db8::/32 2001:db8::2 -weight 10 > route add -6 2001:db8::/32 2001:db8::3 -weight 20 > > netstat -6On > > Nexthop groups data > > Internet6: > GrpIdx NhIdx Weight Slots Gateway > Netif Refcnt > 1 --- --- --- --- > - 1 > 13 10 1 2001:db8::2 > vlan2 > 14 20 2 2001:db8::3 > vlan2 > > Next steps: > * Land outbound hashing for locally-originated routes ( D26523 ). > * Fix net/bird multipath (net/frr seems to work fine) > * Add ROUTE_MPATH to GENERIC > * Set net.route.multipath=1 by default > > Tested by: olivier > Reviewed by:glebius > Relnotes: yes > Differential Revision: https://reviews.freebsd.org/D26449 > > Added: > head/sys/net/route/mpath_ctl.c (contents, props changed) > head/sys/net/route/nhgrp.c (contents, props changed) > head/sys/net/route/nhgrp_ctl.c (contents, props changed) > head/sys/net/route/nhgrp_var.h (contents, props changed) > head/usr.bin/netstat/nhgrp.c (contents, props changed) > Modified: > head/sys/conf/NOTES > head/sys/conf/files > head/sys/conf/options > head/sys/net/radix.c > head/sys/net/route.c > head/sys/net/route.h > head/sys/net/route/nhop.c > head/sys/net/route/nhop.h > head/sys/net/route/nhop_ctl.c > head/sys/net/route/nhop_var.h > head/sys/net/route/route_ctl.c > head/sys/net/route/route_ctl.h > head/sys/net/route/route_helpers.c > head/sys/net/route/route_var.h > head/sys/net/rtsock.c > head/sys/netinet/in.c > head/sys/netinet/in_fib.c > head/sys/netinet/in_rmx.c > head/sys/netinet/ip_output.c > head/sys/netinet6/in6_fib.c > head/sys/netinet6/in6_rmx.c > head/sys/netinet6/nd6.c > head/sys/sys/socket.h > head/usr.bin/netstat/Makefile > head/usr.bin/netstat/common.h > head/usr.bin/netstat/main.c > head/usr.bin/netstat/netstat.h > head/usr.bin/netstat/nhops.c > > Modified: head/sys/conf/NOTES > == > --- head/sys/conf/NOTES Sat Oct 3 09:36:33 2020(r366389) > +++ head/sys/conf/NOTES Sat Oct 3 10:47:17 2020(r366390) > @@ -1002,7 +1002,7 @@ device lagg > # > # TCP_HHOOK enables the hhook(9) framework hooks for the TCP stack. > # > -# RADIX_MPATH provides support for equal-cost multi-path routing. > +# ROUTE_MPATH provides support for multipath routing. > # > options MROUTING# Multicast routing > options IPFIREWALL #firewall > @@ -1023,7 +1023,7 @@ options TCPDEBUG > options TCPPCAP > options TCP_BLACKBOX > options TCP_HHOOK > -options RADIX_MPATH > +options ROUTE_MPATH
svn commit: r366392 - head/sys/riscv/riscv
Author: trasz
Date: Sat Oct 3 13:01:07 2020
New Revision: 366392
URL: https://svnweb.freebsd.org/changeset/base/366392
Log:
Optimize riscv's cpu_fetch_syscall_args(), making it possible
for the compiler to inline the memcpy.
Reviewed by: arichardson, mhorne
MFC after:2 weeks
Sponsored by: DARPA
Differential Revision:https://reviews.freebsd.org/D26528
Modified:
head/sys/riscv/riscv/trap.c
Modified: head/sys/riscv/riscv/trap.c
==
--- head/sys/riscv/riscv/trap.c Sat Oct 3 12:03:08 2020(r366391)
+++ head/sys/riscv/riscv/trap.c Sat Oct 3 13:01:07 2020(r366392)
@@ -96,30 +96,31 @@ int
cpu_fetch_syscall_args(struct thread *td)
{
struct proc *p;
- register_t *ap;
+ register_t *ap, *dst_ap;
struct syscall_args *sa;
- int nap;
- nap = NARGREG;
p = td->td_proc;
sa = &td->td_sa;
ap = &td->td_frame->tf_a[0];
+ dst_ap = &sa->args[0];
sa->code = td->td_frame->tf_t[0];
- if (sa->code == SYS_syscall || sa->code == SYS___syscall) {
+ if (__predict_false(sa->code == SYS_syscall || sa->code ==
SYS___syscall)) {
sa->code = *ap++;
- nap--;
+ } else {
+ *dst_ap++ = *ap++;
}
- if (sa->code >= p->p_sysent->sv_size)
+ if (__predict_false(sa->code >= p->p_sysent->sv_size))
sa->callp = &p->p_sysent->sv_table[0];
else
sa->callp = &p->p_sysent->sv_table[sa->code];
- memcpy(sa->args, ap, nap * sizeof(register_t));
- if (sa->callp->sy_narg > nap)
- panic("TODO: Could we have more then %d args?", NARGREG);
+ KASSERT(sa->callp->sy_narg <= nitems(sa->args),
+ ("Syscall %d takes too many arguments", sa->code));
+
+ memcpy(dst_ap, ap, (NARGREG - 1) * sizeof(register_t));
td->td_retval[0] = 0;
td->td_retval[1] = 0;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366393 - head/tools/tools/netmap
Author: vmaffione
Date: Sat Oct 3 13:19:48 2020
New Revision: 366393
URL: https://svnweb.freebsd.org/changeset/base/366393
Log:
netmap: tools: fix several compiler warnings
MFC after:1 week
Modified:
head/tools/tools/netmap/Makefile
head/tools/tools/netmap/bridge.c
head/tools/tools/netmap/ctrs.h
head/tools/tools/netmap/lb.c
head/tools/tools/netmap/nmreplay.c
head/tools/tools/netmap/pkt-gen.c
head/tools/tools/netmap/pkt_hash.c
Modified: head/tools/tools/netmap/Makefile
==
--- head/tools/tools/netmap/MakefileSat Oct 3 13:01:07 2020
(r366392)
+++ head/tools/tools/netmap/MakefileSat Oct 3 13:19:48 2020
(r366393)
@@ -21,6 +21,8 @@ LDFLAGS += -lm # used by nmreplay
.include
.include
+CFLAGS += -Wno-cast-align
+
all: $(PROGS)
pkt-gen: pkt-gen.o
Modified: head/tools/tools/netmap/bridge.c
==
--- head/tools/tools/netmap/bridge.cSat Oct 3 13:01:07 2020
(r366392)
+++ head/tools/tools/netmap/bridge.cSat Oct 3 13:19:48 2020
(r366393)
@@ -14,7 +14,7 @@
#include
#include
-int verbose = 0;
+static int verbose = 0;
static int do_abort = 0;
static int zerocopy = 1; /* enable zerocopy if possible */
@@ -31,7 +31,7 @@ sigint_h(int sig)
/*
* how many packets on this set of queues ?
*/
-int
+static int
pkt_queued(struct nm_desc *d, int tx)
{
u_int i, tot = 0;
Modified: head/tools/tools/netmap/ctrs.h
==
--- head/tools/tools/netmap/ctrs.h Sat Oct 3 13:01:07 2020
(r366392)
+++ head/tools/tools/netmap/ctrs.h Sat Oct 3 13:19:48 2020
(r366393)
@@ -18,12 +18,12 @@ struct my_ctrs {
* Caller has to make sure that the buffer is large enough.
*/
static const char *
-norm2(char *buf, double val, char *fmt, int normalize)
+norm2(char *buf, double val, const char *fmt, int normalize)
{
- char *units[] = { "", "K", "M", "G", "T" };
+ const char *units[] = { "", "K", "M", "G", "T" };
u_int i;
if (normalize)
- for (i = 0; val >=1000 && i < sizeof(units)/sizeof(char *) - 1;
i++)
+ for (i = 0; val >=1000 && i < sizeof(units)/sizeof(const char
*) - 1; i++)
val /= 1000;
else
i=0;
Modified: head/tools/tools/netmap/lb.c
==
--- head/tools/tools/netmap/lb.cSat Oct 3 13:01:07 2020
(r366392)
+++ head/tools/tools/netmap/lb.cSat Oct 3 13:19:48 2020
(r366393)
@@ -89,7 +89,7 @@ struct compact_ipv6_hdr {
#define BUF_REVOKE 100
#define STAT_MSG_MAXSIZE 1024
-struct {
+static struct {
char ifname[MAX_IFNAMELEN];
char base_name[MAX_IFNAMELEN];
int netmap_fd;
@@ -115,7 +115,7 @@ struct overflow_queue {
uint32_t size;
};
-struct overflow_queue *freeq;
+static struct overflow_queue *freeq;
static inline int
oq_full(struct overflow_queue *q)
@@ -160,12 +160,12 @@ oq_deq(struct overflow_queue *q)
static volatile int do_abort = 0;
-uint64_t dropped = 0;
-uint64_t forwarded = 0;
-uint64_t received_bytes = 0;
-uint64_t received_pkts = 0;
-uint64_t non_ip = 0;
-uint32_t freeq_n = 0;
+static uint64_t dropped = 0;
+static uint64_t forwarded = 0;
+static uint64_t received_bytes = 0;
+static uint64_t received_pkts = 0;
+static uint64_t non_ip = 0;
+static uint32_t freeq_n = 0;
struct port_des {
char interface[MAX_PORTNAMELEN];
@@ -178,7 +178,7 @@ struct port_des {
struct group_des *group;
};
-struct port_des *ports;
+static struct port_des *ports;
/* each group of pipes receives all the packets */
struct group_des {
@@ -190,7 +190,7 @@ struct group_des {
int custom_port;
};
-struct group_des *groups;
+static struct group_des *groups;
/* statistcs */
struct counters {
@@ -205,7 +205,7 @@ struct counters {
#define COUNTERS_FULL 1
};
-struct counters counters_buf;
+static struct counters counters_buf;
static void *
print_stats(void *arg)
@@ -387,7 +387,7 @@ static void sigint_h(int sig)
signal(SIGINT, SIG_DFL);
}
-void usage()
+static void usage()
{
printf("usage: lb [options]\n");
printf("where options are:\n");
@@ -404,9 +404,9 @@ void usage()
}
static int
-parse_pipes(char *spec)
+parse_pipes(const char *spec)
{
- char *end = index(spec, ':');
+ const char *end = index(spec, ':');
static int max_groups = 0;
struct group_des *g;
@@ -458,7 +458,8 @@ parse_pipes(char *spec)
}
/* complete the initialization of the groups data structure */
-void init_groups(void)
+static void
+init_groups(void)
{
int i, j, t = 0;
struct group_des *g = NULL;
@@ -484,7 +485,8 @@ void init_groups(void)
* chain headed by g.
* Ret
svn commit: r366394 - head/tools/tools/netmap
Author: vmaffione Date: Sat Oct 3 13:27:12 2020 New Revision: 366394 URL: https://svnweb.freebsd.org/changeset/base/366394 Log: netmap: tools: extend CFLAGS after including bsd.prog.mk MFC after:1 week Modified: head/tools/tools/netmap/Makefile Modified: head/tools/tools/netmap/Makefile == --- head/tools/tools/netmap/MakefileSat Oct 3 13:19:48 2020 (r366393) +++ head/tools/tools/netmap/MakefileSat Oct 3 13:27:12 2020 (r366394) @@ -7,9 +7,10 @@ PROGS = pkt-gen nmreplay bridge lb CLEANFILES = $(PROGS) *.o MAN= -CFLAGS += -Werror -Wall -CFLAGS += -Wextra +.include +.include + LDFLAGS += -lpthread .ifdef WITHOUT_PCAP CFLAGS += -DNO_PCAP @@ -17,9 +18,6 @@ CFLAGS += -DNO_PCAP LDFLAGS += -lpcap .endif LDFLAGS += -lm # used by nmreplay - -.include -.include CFLAGS += -Wno-cast-align ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366395 - stable/12/sys/netgraph/bluetooth/include
Author: kevans
Date: Sat Oct 3 13:27:57 2020
New Revision: 366395
URL: https://svnweb.freebsd.org/changeset/base/366395
Log:
MFC r361254: Fix Typo in ng_hci_le_connection_complete_ep struct.
PR: 246538
Modified:
stable/12/sys/netgraph/bluetooth/include/ng_hci.h
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/netgraph/bluetooth/include/ng_hci.h
==
--- stable/12/sys/netgraph/bluetooth/include/ng_hci.h Sat Oct 3 13:27:12
2020(r366394)
+++ stable/12/sys/netgraph/bluetooth/include/ng_hci.h Sat Oct 3 13:27:57
2020(r366395)
@@ -1955,7 +1955,7 @@ typedef struct {
u_int16_t interval;
u_int8_tlatency;
u_int16_t supervision_timeout;
- u_int8_tmaster_clock_accracy;
+ u_int8_tmaster_clock_accuracy;
} __attribute__ ((packed)) ng_hci_le_connection_complete_ep;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r366386 - head/sys/dev/pwm
On 10/3/20, Emmanuel Vadot wrote: > Author: manu > Date: Sat Oct 3 08:31:28 2020 > New Revision: 366386 > URL: https://svnweb.freebsd.org/changeset/base/366386 > > Log: > pwm_backlight: Fix 32 bits build > Some kernels are still failing at least with: In file included from /usr/src/sys/dev/pwm/pwm_backlight.c:56: /usr/src/sys/dev/extres/regulator/regulator.h:38:10: fatal error: 'regnode_if.h' file not found #include "regnode_if.h" ^~ 1 error generated. --- pwm_backlight.o --- *** [pwm_backlight.o] Error code 1 arm ARMADA38X kernel failed, check _.arm.ARMADA38X for details arm EFIKA_MX kernel failed, check _.arm.EFIKA_MX for details arm IMX6 kernel failed, check _.arm.IMX6 for details arm IMX53 kernel failed, check _.arm.IMX53 for details arm VYBRID kernel failed, check _.arm.VYBRID for details arm ZEDBOARD kernel failed, check _.arm.ZEDBOARD for details -- Mateusz Guzik ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366396 - head/sys/conf
Author: manu Date: Sat Oct 3 14:00:33 2020 New Revision: 366396 URL: https://svnweb.freebsd.org/changeset/base/366396 Log: pwm_backlight: Depend on ext_resources This driver cannot work without it. Modified: head/sys/conf/files Modified: head/sys/conf/files == --- head/sys/conf/files Sat Oct 3 13:27:57 2020(r366395) +++ head/sys/conf/files Sat Oct 3 14:00:33 2020(r366396) @@ -2755,7 +2755,7 @@ dev/pwm/pwmbus.c optional pwm | pwmbus dev/pwm/pwmbus_if.moptional pwm | pwmbus dev/pwm/ofw_pwm.c optional pwm fdt | pwmbus fdt dev/pwm/ofw_pwmbus.c optional pwm fdt | pwmbus fdt -dev/pwm/pwm_backlight.coptional pwm pwm_backlight fdt +dev/pwm/pwm_backlight.coptional pwm pwm_backlight ext_resources fdt dev/quicc/quicc_core.c optional quicc dev/ral/rt2560.c optional ral dev/ral/rt2661.c optional ral ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366397 - head/sys/modules/pwm/pwm_backlight
Author: manu Date: Sat Oct 3 14:01:20 2020 New Revision: 366397 URL: https://svnweb.freebsd.org/changeset/base/366397 Log: pwm_backlight: Add regnode_if.h to SRCS If the kernel config doesn't have this pseudo device it will not be generated and then the module will fail to compile. Reported by: mjg Modified: head/sys/modules/pwm/pwm_backlight/Makefile Modified: head/sys/modules/pwm/pwm_backlight/Makefile == --- head/sys/modules/pwm/pwm_backlight/Makefile Sat Oct 3 14:00:33 2020 (r366396) +++ head/sys/modules/pwm/pwm_backlight/Makefile Sat Oct 3 14:01:20 2020 (r366397) @@ -10,6 +10,7 @@ SRCS+=\ device_if.h \ opt_platform.h \ pwmbus_if.h \ + regnode_if.h \ ofw_bus_if.h .include ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366398 - in head/sys/net: . route
Author: melifaro
Date: Sat Oct 3 14:37:54 2020
New Revision: 366398
URL: https://svnweb.freebsd.org/changeset/base/366398
Log:
Remove ROUTE_MPATH-related warnings introduced in r366390.
Reported by: mjg
Modified:
head/sys/net/route/route_ctl.c
head/sys/net/rtsock.c
Modified: head/sys/net/route/route_ctl.c
==
--- head/sys/net/route/route_ctl.c Sat Oct 3 14:01:20 2020
(r366397)
+++ head/sys/net/route/route_ctl.c Sat Oct 3 14:37:54 2020
(r366398)
@@ -91,7 +91,9 @@ static void rib_notify(struct rib_head *rnh, enum rib_
struct rib_cmd_info *rc);
static void destroy_subscription_epoch(epoch_context_t ctx);
+#ifdef ROUTE_MPATH
static bool rib_can_multipath(struct rib_head *rh);
+#endif
/* Per-vnet multipath routing configuration */
SYSCTL_DECL(_net_route);
Modified: head/sys/net/rtsock.c
==
--- head/sys/net/rtsock.c Sat Oct 3 14:01:20 2020(r366397)
+++ head/sys/net/rtsock.c Sat Oct 3 14:37:54 2020(r366398)
@@ -847,6 +847,7 @@ update_rtm_from_rc(struct rt_addrinfo *info, struct rt
return (0);
}
+#ifdef ROUTE_MPATH
static void
save_del_notification(struct rib_cmd_info *rc, void *_cbdata)
{
@@ -864,6 +865,7 @@ save_add_notification(struct rib_cmd_info *rc, void *_
if (rc->rc_cmd == RTM_ADD)
*rc_new = *rc;
}
+#endif
/*ARGSUSED*/
static int
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366399 - in stable/12: share/man/man5 share/man/man7 tools/build/options
Author: gbe (doc committer) Date: Sat Oct 3 14:45:17 2020 New Revision: 366399 URL: https://svnweb.freebsd.org/changeset/base/366399 Log: MFC r365640: Improvements for the src.conf(5) and build(7) man pages PR: 203863 (based on) Submitted by: Russell Haley Reviewed by: bcr, imp Approved by: imp Differential Revision:https://reviews.freebsd.org/D26343 Modified: stable/12/share/man/man5/src.conf.5 stable/12/share/man/man7/build.7 stable/12/tools/build/options/makeman Directory Properties: stable/12/ (props changed) Modified: stable/12/share/man/man5/src.conf.5 == --- stable/12/share/man/man5/src.conf.5 Sat Oct 3 14:37:54 2020 (r366398) +++ stable/12/share/man/man5/src.conf.5 Sat Oct 3 14:45:17 2020 (r366399) @@ -9,7 +9,8 @@ .Sh DESCRIPTION The .Nm -file contains settings that will apply to every build involving the +file contains variables that control what components will be generated during +the build process of the .Fx source tree; see .Xr build 7 . Modified: stable/12/share/man/man7/build.7 == --- stable/12/share/man/man7/build.7Sat Oct 3 14:37:54 2020 (r366398) +++ stable/12/share/man/man7/build.7Sat Oct 3 14:45:17 2020 (r366399) @@ -24,12 +24,12 @@ .\" .\" $FreeBSD$ .\" -.Dd November 10, 2018 +.Dd September 11, 2020 .Dt BUILD 7 .Os .Sh NAME .Nm build -.Nd information on how to build the system +.Nd General instructions on how to build the system .Sh DESCRIPTION The sources for the .Fx @@ -68,10 +68,11 @@ command is used in each of these directories to build things in that directory. Issuing the .Xr make 1 -command in any directory or -subdirectory of those directories has the same effect as issuing the -same command in all subdirectories of that directory. -With no target specified, the things in that directory are just built. +command in any directory issues the +.Xr make 1 +command recursively in all subdirectories. +With no target specified, the items in the directories are built +and no further action is taken. .Pp A source tree is allowed to be read-only. As described in @@ -95,6 +96,14 @@ variables described in the section below, and by the variables documented in .Xr make.conf 5 . .Pp +The default components included in the build are specified in the file +.Pa /etc/src.conf +in the source tree. +To override the default file, include the SRCCONF option in the make steps, +pointing to a custom src.conf file. +For more information see +.Xr src.conf 5 . +.Pp The following list provides the names and actions for the targets supported by the build system: .Bl -tag -width ".Cm cleandepend" @@ -573,6 +582,12 @@ process. .Bd -literal -offset indent make PORTS_MODULES=emulators/kqemu-kmod kernel .Ed +.It Va SRCCONF +Specify a file to override the default +.Pa /etc/src.conf . +The src.conf file controls the components to build. +See +.Xr src.conf 5 .It Va STRIPBIN Command to use at install time when stripping binaries. Be sure to add any additional tools required to run Modified: stable/12/tools/build/options/makeman == --- stable/12/tools/build/options/makeman Sat Oct 3 14:37:54 2020 (r366398) +++ stable/12/tools/build/options/makeman Sat Oct 3 14:45:17 2020 (r366399) @@ -154,7 +154,8 @@ main() .Sh DESCRIPTION The .Nm -file contains settings that will apply to every build involving the +file contains variables that control what components will be generated during +the build process of the .Fx source tree; see .Xr build 7 . ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366400 - stable/12/tools/build/options
Author: gbe (doc committer) Date: Sat Oct 3 14:51:15 2020 New Revision: 366400 URL: https://svnweb.freebsd.org/changeset/base/366400 Log: MFC r365903: src.conf(5): Fix some mandoc issues in source files - new sentence, new line - blank line in fill mode Event:September 2020 Bugathon Modified: stable/12/tools/build/options/WITH_LOADER_FIREWIRE stable/12/tools/build/options/WITH_NVME Directory Properties: stable/12/ (props changed) Modified: stable/12/tools/build/options/WITH_LOADER_FIREWIRE == --- stable/12/tools/build/options/WITH_LOADER_FIREWIRE Sat Oct 3 14:45:17 2020(r366399) +++ stable/12/tools/build/options/WITH_LOADER_FIREWIRE Sat Oct 3 14:51:15 2020(r366400) @@ -1,3 +1,3 @@ .\" $FreeBSD$ -Enable firewire support in /boot/loader on x86. This option is a nop -on all other platforms. +Enable firewire support in /boot/loader on x86. +This option is a nop on all other platforms. Modified: stable/12/tools/build/options/WITH_NVME == --- stable/12/tools/build/options/WITH_NVME Sat Oct 3 14:45:17 2020 (r366399) +++ stable/12/tools/build/options/WITH_NVME Sat Oct 3 14:51:15 2020 (r366400) @@ -1,3 +1,2 @@ .\" $FreeBSD$ Set to build nvme related tools and kernel modules. - ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366401 - stable/12/share/man/man7
Author: gbe (doc committer) Date: Sat Oct 3 15:06:47 2020 New Revision: 366401 URL: https://svnweb.freebsd.org/changeset/base/366401 Log: MFC r365904: crypto(7): Correct Sections out of conventional order error Event:September 2020 Bugathon Modified: stable/12/share/man/man7/crypto.7 Directory Properties: stable/12/ (props changed) Modified: stable/12/share/man/man7/crypto.7 == --- stable/12/share/man/man7/crypto.7 Sat Oct 3 14:51:15 2020 (r366400) +++ stable/12/share/man/man7/crypto.7 Sat Oct 3 15:06:47 2020 (r366401) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 2, 2015 +.Dd June 4, 2020 .Dt CRYPTO 7 .Os .Sh NAME @@ -137,5 +137,10 @@ in the cipher mode section. .Sh SEE ALSO .Xr crypto 4 , .Xr crypto 9 +.Sh HISTORY +The +.Nm +manpage first appeared in +.Fx 10.1 . .Sh BUGS Not all the implemented algorithms are listed. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r366382 - in head/sys: amd64/conf arm/conf arm64/conf i386/conf powerpc/conf
On 10/2/20 1:52 PM, Emmanuel Vadot wrote:
> Author: manu
> Date: Fri Oct 2 20:52:09 2020
> New Revision: 366382
> URL: https://svnweb.freebsd.org/changeset/base/366382
>
> Log:
> Fix LINT: Add backlight to NOTES
>
> Modified:
> head/sys/amd64/conf/NOTES
> head/sys/arm/conf/NOTES
> head/sys/arm64/conf/NOTES
> head/sys/i386/conf/NOTES
> head/sys/powerpc/conf/NOTES
Perhaps sys/x86/conf/NOTES rather than sys/{amd64,i386}/conf/NOTES?
--
John Baldwin
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r366381 - head/sys/modules/pwm
In message <20201003103357.24c2f3201ab4b2637fb8e...@bidouilliste.com>,
Emmanuel
Vadot writes:
> On Fri, 02 Oct 2020 21:12:01 -0700
> Cy Schubert wrote:
>
> > In message c
> > om>
> > , Mateusz Guzik writes:
> > > On 10/2/20, Emmanuel Vadot wrote:
> > > > Author: manu
> > > > Date: Fri Oct 2 19:56:54 2020
> > > > New Revision: 366381
> > > > URL: https://svnweb.freebsd.org/changeset/base/366381
> > > >
> > > > Log:
> > > > pwm_backlight: Restrict module to armv7 and aarch64
> > > >
> > > > Both powerpc64 and riscv uses fdt but don't use EXT_RESOURCES.
> > > >
> > > > Reported by: jenkins
> > > >
> > > > Modified:
> > > > head/sys/modules/pwm/Makefile
> > > >
> > > > Modified: head/sys/modules/pwm/Makefile
> > > > ===
>
> > > ===
> > > > --- head/sys/modules/pwm/Makefile Fri Oct 2 19:16:06 2020
> (r36638
> > > 0)
> > > > +++ head/sys/modules/pwm/Makefile Fri Oct 2 19:56:54 2020
> (r36638
> > > 1)
> > > > @@ -6,8 +6,10 @@ SUBDIR = \
> > > > pwmbus \
> > > > pwmc \
> > > >
> > > > +.if ${MACHINE_ARCH} == "armv7" || ${MACHINE_ARCH} == "aarch64"
> > > > .if !empty(OPT_FDT)
> > > > SUBDIR += pwm_backlight
> > > > +.endif
> > > > .endif
> > > >
> > > > .include
> > >
> > > I don't know which commits are to blame, but the following is broken
> > > in tinderbox:
> > > arm GENERIC kernel failed, check _.arm.GENERIC for details
> > > arm GENERIC-NODEBUG kernel failed, check _.arm.GENERIC-NODEBUG for detail
> s
> > > arm TEGRA124 kernel failed, check _.arm.TEGRA124 for details
> > > arm ARMADA38X kernel failed, check _.arm.ARMADA38X for details
> > > arm VYBRID kernel failed, check _.arm.VYBRID for details
> > > arm GENERIC-MMCCAM kernel failed, check _.arm.GENERIC-MMCCAM for details
> > > arm LINT kernel failed, check _.arm.LINT for details
> > > arm IMX53 kernel failed, check _.arm.IMX53 for details
> > > arm IMX6 kernel failed, check _.arm.IMX6 for details
> > > arm EFIKA_MX kernel failed, check _.arm.EFIKA_MX for details
> > > arm ZEDBOARD kernel failed, check _.arm.ZEDBOARD for details
> >
> > And on amd64 my laptop is useless now.
> >
> > Oct 2 18:23:58 slippy kernel: link_elf_obj: symbol
> > acpi_video_get_backlight_type undefined
> > Oct 2 18:23:58 slippy kernel: Warning: memory type debugfsint leaked
> > memory on destroy (2 allocations, 80 bytes leaked).
> > Oct 2 18:23:59 slippy kernel: linker_load_file: /boot/modules/i915kms.ko -
>
> > unsupported file type
> >
> > And this is also after updating drm-current-kmod.
> >
> >
> > --
> > Cheers,
> > Cy Schubert
> > FreeBSD UNIX: Web: https://FreeBSD.org
> > NTP: Web: https://nwtime.org
> >
> > The need of the many outweighs the greed of the few.
> >
> >
>
> Fixed in ports r551266, sorry.
Yes, that fixes it. Thanks.
--
Cheers,
Cy Schubert
FreeBSD UNIX: Web: https://FreeBSD.org
NTP: Web: https://nwtime.org
The need of the many outweighs the greed of the few.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366402 - head/sbin/ipfw
Author: gbe (doc committer) Date: Sat Oct 3 18:30:01 2020 New Revision: 366402 URL: https://svnweb.freebsd.org/changeset/base/366402 Log: ipfw(8): Bugfixes for some issues reported by mandoc - whitespace at end of input line - new sentence, new line - skipping paragraph macro: Pp before Pp MFC after:1 week Modified: head/sbin/ipfw/ipfw.8 Modified: head/sbin/ipfw/ipfw.8 == --- head/sbin/ipfw/ipfw.8 Sat Oct 3 15:06:47 2020(r366401) +++ head/sbin/ipfw/ipfw.8 Sat Oct 3 18:30:01 2020(r366402) @@ -527,9 +527,9 @@ ipfw add 10 skipto 4000 all from any to any layer2 out ether_demux and bdg_forward). .Pp Also note that only actions -.Cm allow, -.Cm deny, -.Cm netgraph, +.Cm allow , +.Cm deny , +.Cm netgraph , .Cm ngtee and related to .Cm dummynet @@ -682,7 +682,7 @@ to simulate the effect of multiple paths leading to ou packet delivery. .Pp Note: this condition is checked before any other condition, including -ones such as +ones such as .Cm keep-state or .Cm check-state @@ -991,7 +991,8 @@ It is possible to use the .Cm tablearg keyword with a skipto for a .Em computed -skipto. Skipto may work either in O(log(N)) or in O(1) depending +skipto. +Skipto may work either in O(log(N)) or in O(1) depending on amount of memory and/or sysctl variables. See the .Sx SYSCTL VARIABLES @@ -1454,7 +1455,7 @@ or a hostname) and the mask of .Ar mask , specified as allowed by -.Xr inet_pton. +.Xr inet_pton . As an example, fe::640:0:0/::::0:0 will match fe:*:*:*:0:640:*:*. This form is advised only for non-contiguous @@ -1528,7 +1529,8 @@ Alias for .Cm layer2 . .It Cm defer-immediate-action | defer-action A rule with this option will not perform normal action -upon a match. This option is intended to be used with +upon a match. +This option is intended to be used with .Cm record-state or .Cm keep-state @@ -1539,8 +1541,9 @@ Rules with both and .Cm defer-immediate-action create a dynamic rule and continue with the next rule without actually -performing the action part of this rule. When the rule is later activated -via the state table, the action is performed as usual. +performing the action part of this rule. +When the rule is later activated via the state table, the action is +performed as usual. .It Cm diverted Matches only packets generated by a divert socket. .It Cm diverted-loopback @@ -1604,7 +1607,7 @@ Matches IPv6 packets containing any of the flow labels is a comma separated list of numeric flow labels. .It Cm frag Ar spec Matches IPv4 packets whose -.Cm ip_off +.Cm ip_off field contains the comma separated list of IPv4 fragmentation options specified in .Ar spec . @@ -1793,7 +1796,8 @@ packet is found. The .Ar :flowname is used to assign additional to addresses, ports and protocol parameter -to dynamic rule. It can be used for more accurate matching by +to dynamic rule. +It can be used for more accurate matching by .Cm check-state rule. The @@ -2212,8 +2216,8 @@ One or more entries can be added to a table at once us command. Addition of all items are performed atomically. By default, error in addition of one entry does not influence -addition of other entries. However, non-zero error code is returned -in that case. +addition of other entries. +However, non-zero error code is returned in that case. Special .Cm atomic keyword may be specified before @@ -2224,8 +2228,8 @@ One or more entries can be removed from a table at onc .Cm delete command. By default, error in removal of one entry does not influence -removing of other entries. However, non-zero error code is returned -in that case. +removing of other entries. +However, non-zero error code is returned in that case. .Pp It may be possible to check what entry will be found on particular .Ar table-key @@ -2983,10 +2987,12 @@ and are integer numbers specifying thresholds for queue management (thresholds are computed in bytes if the queue has been defined in bytes, in slots otherwise). -The two parameters can also be of the same value if needed. The +The two parameters can also be of the same value if needed. +The .Nm dummynet also supports the gentle RED variant (gred) and ECN (Explicit Congestion -Notification) as optional. Three +Notification) as optional. +Three .Xr sysctl 8 variables can be used to control the RED behaviour: .Bl -tag -width indent @@ -3266,7 +3272,7 @@ Skip instance in case of global state lookup (see belo .El .Pp Some specials value can be supplied instead of -.Va nat_number: +.Va nat_number : .Bl -tag -width indent .It Cm global Looks up translation state in all configured nat instances. @@ -3370,7 +3376,7 @@ Thus translator host should be configured as IPv4 and Also this means, that a packet is handled by firewall twice. First time an original packet is handled and consumed by translator, and then it is handled again as translated pa
svn commit: r366403 - head/bin/ls
Author: gbe (doc committer) Date: Sat Oct 3 18:34:24 2020 New Revision: 366403 URL: https://svnweb.freebsd.org/changeset/base/366403 Log: ls(1): Bugfix for an issue reported by mandoc - no blank before trailing delimiter MFC after:1 week Modified: head/bin/ls/ls.1 Modified: head/bin/ls/ls.1 == --- head/bin/ls/ls.1Sat Oct 3 18:30:01 2020(r366402) +++ head/bin/ls/ls.1Sat Oct 3 18:34:24 2020(r366403) @@ -40,7 +40,7 @@ .Nd list directory contents .Sh SYNOPSIS .Nm -.Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1, +.Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1 , .Op Fl -color Ns = Ns Ar when .Op Fl D Ar format .Op Ar ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366404 - head/bin/cp
Author: gbe (doc committer) Date: Sat Oct 3 18:36:22 2020 New Revision: 366404 URL: https://svnweb.freebsd.org/changeset/base/366404 Log: cp(1): Bugfixes for some issues reported by mandoc - no blank before trailing delimiter MFC after:1 week Modified: head/bin/cp/cp.1 Modified: head/bin/cp/cp.1 == --- head/bin/cp/cp.1Sat Oct 3 18:34:24 2020(r366403) +++ head/bin/cp/cp.1Sat Oct 3 18:36:22 2020(r366404) @@ -300,9 +300,9 @@ differ as they copy special files as normal files while recreating a hierarchy. .Pp The -.Fl l, -.Fl s, -.Fl v, +.Fl l , +.Fl s , +.Fl v , .Fl x and .Fl n ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366405 - head/sbin/devd
Author: gbe (doc committer) Date: Sat Oct 3 18:37:59 2020 New Revision: 366405 URL: https://svnweb.freebsd.org/changeset/base/366405 Log: devd.conf(5): Bugfix for an issue reported by mandoc - whitespace at end of input line MFC after:1 week Modified: head/sbin/devd/devd.conf.5 Modified: head/sbin/devd/devd.conf.5 == --- head/sbin/devd/devd.conf.5 Sat Oct 3 18:36:22 2020(r366404) +++ head/sbin/devd/devd.conf.5 Sat Oct 3 18:37:59 2020(r366405) @@ -530,7 +530,7 @@ keyboard has been pressed. A brightness level change has been requested. Direction is in the $notify variable. .It Li PMU Ta Li keys Ta mute Ta -The mute key +The mute key .It Li PMU Ta Li keys Ta volume Ta A volume level change has been requested. Direction is in the $notify variable. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366406 - head/sbin/camcontrol
Author: gbe (doc committer) Date: Sat Oct 3 18:40:02 2020 New Revision: 366406 URL: https://svnweb.freebsd.org/changeset/base/366406 Log: camcontrol(8): Bugfixes for some issues reported by mandoc - new sentence, new line MFC after:1 week Modified: head/sbin/camcontrol/camcontrol.8 Modified: head/sbin/camcontrol/camcontrol.8 == --- head/sbin/camcontrol/camcontrol.8 Sat Oct 3 18:37:59 2020 (r366405) +++ head/sbin/camcontrol/camcontrol.8 Sat Oct 3 18:40:02 2020 (r366406) @@ -1511,10 +1511,10 @@ user. This option can be combined with other options such as .Fl e Em pwd .Pp -A master password may be set in a addition to the user password. The purpose of -the master password is to allow an administrator to establish a password that -is kept secret from the user, and which may be used to unlock the device if the -user password is lost. +A master password may be set in a addition to the user password. +The purpose of the master password is to allow an administrator to establish +a password that is kept secret from the user, and which may be used to unlock +the device if the user password is lost. .Pp .Em Note: Setting the master password does not enable device security. @@ -2528,7 +2528,8 @@ whether it is enabled and what the timer value is. .It Ic timestamp Issue REPORT TIMESTAMP or SET TIMESTAMP .Tn SCSI -commands. Either the +commands. +Either the .Fl r option or the .Fl s @@ -2552,7 +2553,8 @@ time, but override the system time zone and use UTC in .El .Bl -tag -width 6n .It Fl s -Set the device's timestamp. Either the +Set the device's timestamp. +Either the .Fl f and .Fl T ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366407 - head/sbin/dhclient
Author: gbe (doc committer) Date: Sat Oct 3 18:42:15 2020 New Revision: 366407 URL: https://svnweb.freebsd.org/changeset/base/366407 Log: dhclient(8): Bugfixes for some issues reported by mandoc - no blank before trailing delimiter - new sentence, new line MFC after:1 week Modified: head/sbin/dhclient/dhclient.leases.5 head/sbin/dhclient/dhcp-options.5 Modified: head/sbin/dhclient/dhclient.leases.5 == --- head/sbin/dhclient/dhclient.leases.5Sat Oct 3 18:40:02 2020 (r366406) +++ head/sbin/dhclient/dhclient.leases.5Sat Oct 3 18:42:15 2020 (r366407) @@ -54,7 +54,7 @@ the last one in the file is used. The file is written as a log, so this is not an unusual occurrence. .Pp The lease file is named -.Pa dhclient.leases. Ns Ar IFNAME , +.Pa dhclient.leases . Ns Ar IFNAME , where .Ar IFNAME represents the network interface the DHCP client acquired the lease on. @@ -70,7 +70,7 @@ The format of the lease declarations is described in .Xr dhclient.conf 5 . .Sh FILES .Bl -tag -width ".Pa /var/db/dhclient.leases. Ns Ar IFNAME" -.It Pa /var/db/dhclient.leases. Ns Ar IFNAME +.It Pa /var/db/dhclient.leases . Ns Ar IFNAME Current lease file. .El .Sh SEE ALSO Modified: head/sbin/dhclient/dhcp-options.5 == --- head/sbin/dhclient/dhcp-options.5 Sat Oct 3 18:40:02 2020 (r366406) +++ head/sbin/dhclient/dhcp-options.5 Sat Oct 3 18:42:15 2020 (r366407) @@ -267,8 +267,8 @@ This option specifies the domain name that the client resolving hostnames via the Domain Name System. .It Ic option domain-search Ar string ; This option specifies a list of domain names that the client should use -when resolving hostnames via the Domain Name System. This option is -defined in RFC 3397. +when resolving hostnames via the Domain Name System. +This option is defined in RFC 3397. .It Ic option swap-server Ar ip-address ; This specifies the IP address of the client's swap server. .It Ic option root-path Ar string ; ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366408 - head/sbin/fsdb
Author: gbe (doc committer) Date: Sat Oct 3 18:44:13 2020 New Revision: 366408 URL: https://svnweb.freebsd.org/changeset/base/366408 Log: fsdb(8): Fix an issue reported by mandoc - whitespace at end of input line MFC after:1 week Modified: head/sbin/fsdb/fsdb.8 Modified: head/sbin/fsdb/fsdb.8 == --- head/sbin/fsdb/fsdb.8 Sat Oct 3 18:42:15 2020(r366407) +++ head/sbin/fsdb/fsdb.8 Sat Oct 3 18:44:13 2020(r366408) @@ -251,7 +251,7 @@ appeared in written by .An John T. Kohl . It first appeared in -.Fx 2.1.5 +.Fx 2.1.5 ported by Peter Wemm. .Sh BUGS Manipulation of ``short'' symlinks has no effect. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366409 - head/sbin/veriexec
Author: gbe (doc committer) Date: Sat Oct 3 18:46:42 2020 New Revision: 366409 URL: https://svnweb.freebsd.org/changeset/base/366409 Log: veriexec(8): Bugfix for an issue reported by mandoc - consider using OS macro: Nx MFC after:1 week Modified: head/sbin/veriexec/veriexec.8 Modified: head/sbin/veriexec/veriexec.8 == --- head/sbin/veriexec/veriexec.8 Sat Oct 3 18:44:13 2020 (r366408) +++ head/sbin/veriexec/veriexec.8 Sat Oct 3 18:46:42 2020 (r366409) @@ -138,9 +138,8 @@ they are provided for the use of other .Xr mac 4 modules. .Sh HISTORY -The Verified Exec system first appeared in NetBSD. +The Verified Exec system first appeared in +.Nx . This utility derrives from the one found in Junos. The key difference is the requirement that manifest files be digitally signed. - - ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366410 - head/sbin/mdmfs
Author: gbe (doc committer) Date: Sat Oct 3 18:47:50 2020 New Revision: 366410 URL: https://svnweb.freebsd.org/changeset/base/366410 Log: mdmfs(8): Fix an issue reported by mandoc - whitespace at end of input line MFC after:1 week Modified: head/sbin/mdmfs/mdmfs.8 Modified: head/sbin/mdmfs/mdmfs.8 == --- head/sbin/mdmfs/mdmfs.8 Sat Oct 3 18:46:42 2020(r366409) +++ head/sbin/mdmfs/mdmfs.8 Sat Oct 3 18:47:50 2020(r366410) @@ -70,7 +70,7 @@ Based on .Ar md-device , the .Nm -utility either creates a +utility either creates a .Xr tmpfs 5 filesystem, or it configures an .Xr md 4 ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r366403 - head/bin/ls
Gordon Bergling wrote: Author: gbe (doc committer) Date: Sat Oct 3 18:34:24 2020 New Revision: 366403 URL: https://svnweb.freebsd.org/changeset/base/366403 Log: ls(1): Bugfix for an issue reported by mandoc - no blank before trailing delimiter MFC after: 1 week Modified: head/bin/ls/ls.1 Modified: head/bin/ls/ls.1 == --- head/bin/ls/ls.1Sat Oct 3 18:30:01 2020(r366402) +++ head/bin/ls/ls.1Sat Oct 3 18:34:24 2020(r366403) @@ -40,7 +40,7 @@ .Nd list directory contents .Sh SYNOPSIS .Nm -.Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1, +.Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1 , This makes the "," appear after the "]", how about using the following instead: .Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1\&, .Op Fl -color Ns = Ns Ar when .Op Fl D Ar format .Op Ar ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366411 - head/sbin/gvinum
Author: gbe (doc committer) Date: Sat Oct 3 18:49:00 2020 New Revision: 366411 URL: https://svnweb.freebsd.org/changeset/base/366411 Log: gvinum(8): Fix an issue reported by mandoc - new sentence, new line MFC after:1 week Modified: head/sbin/gvinum/gvinum.8 Modified: head/sbin/gvinum/gvinum.8 == --- head/sbin/gvinum/gvinum.8 Sat Oct 3 18:47:50 2020(r366410) +++ head/sbin/gvinum/gvinum.8 Sat Oct 3 18:49:00 2020(r366411) @@ -202,8 +202,8 @@ Terminate access to the objects, or stop .Nm if no parameters are specified. .It Ic stripe Oo Fl fv Oc Oo Fl n Ar name Oc Ar drives -Create a striped volume from the specified drives. If no name is specified, -a unique name will be set by +Create a striped volume from the specified drives. +If no name is specified, a unique name will be set by .Ic gvinum . This organization requires at least two drives. .El ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366412 - head/contrib/lib9p/transport
Author: jceel
Date: Sat Oct 3 18:52:54 2020
New Revision: 366412
URL: https://svnweb.freebsd.org/changeset/base/366412
Log:
Import lib9p 9d5aee77bcc1bf0e79b0a3bfefff5fdf2146283c.
Approved by: trasz (mentor)
Sponsored by: Conclusive Engineering Sp. z o. o.
Modified:
head/contrib/lib9p/transport/socket.c
Directory Properties:
head/contrib/lib9p/ (props changed)
Modified: head/contrib/lib9p/transport/socket.c
==
--- head/contrib/lib9p/transport/socket.c Sat Oct 3 18:49:00 2020
(r366411)
+++ head/contrib/lib9p/transport/socket.c Sat Oct 3 18:52:54 2020
(r366412)
@@ -307,7 +307,7 @@ l9p_socket_send_response(struct l9p_request *req __unu
static void
l9p_socket_drop_response(struct l9p_request *req __unused,
-const struct iovec *iov, size_t niov __unused, void *arg)
+const struct iovec *iov, size_t niov __unused, void *arg __unused)
{
L9P_LOG(L9P_DEBUG, "%p: drop buf=%p", arg, iov[0].iov_base);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366413 - in head: etc/mtree lib lib/lib9p share/mk usr.sbin/bhyve
Author: jceel
Date: Sat Oct 3 19:05:13 2020
New Revision: 366413
URL: https://svnweb.freebsd.org/changeset/base/366413
Log:
Add virtio-9p (aka VirtFS) filesystem sharing to bhyve.
VirtFS allows sharing an arbitrary directory tree between bhyve virtual
machine and the host. Current implementation has a fairly complete support
for 9P2000.L protocol, except for the extended attribute support. It has
been verified to work with the qemu-kvm hypervisor.
Reviewed by: rgrimes, emaste, jhb, trasz
Approved by: trasz (mentor)
MFC after:1 month
Relnotes: yes
Sponsored by: Conclusive Engineering (development), vStack.com (funding)
Differential Revision:https://reviews.freebsd.org/D10335
Added:
head/lib/lib9p/
head/lib/lib9p/Makefile (contents, props changed)
head/usr.sbin/bhyve/pci_virtio_9p.c (contents, props changed)
Modified:
head/etc/mtree/BSD.include.dist
head/lib/Makefile
head/share/mk/bsd.libnames.mk
head/share/mk/src.libnames.mk
head/usr.sbin/bhyve/Makefile
head/usr.sbin/bhyve/bhyve.8
head/usr.sbin/bhyve/virtio.h
Modified: head/etc/mtree/BSD.include.dist
==
--- head/etc/mtree/BSD.include.dist Sat Oct 3 18:52:54 2020
(r366412)
+++ head/etc/mtree/BSD.include.dist Sat Oct 3 19:05:13 2020
(r366413)
@@ -193,6 +193,8 @@
..
lib80211
..
+lib9p
+..
libipt
..
libmilter
Modified: head/lib/Makefile
==
--- head/lib/Makefile Sat Oct 3 18:52:54 2020(r366412)
+++ head/lib/Makefile Sat Oct 3 19:05:13 2020(r366413)
@@ -30,6 +30,7 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \
.WAIT \
libsqlite3 \
geom \
+ lib9p \
libalias \
libarchive \
libauditd \
Added: head/lib/lib9p/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/lib9p/Makefile Sat Oct 3 19:05:13 2020(r366413)
@@ -0,0 +1,28 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../contrib/lib9p
+CFLAGS+= -DWITH_CASPER
+CFLAGS+= -I${.CURDIR}
+CFLAGS+= -I${.CURDIR}/../../contrib/lib9p
+
+LIB= 9p
+PACKAGE= lib${LIB}
+SHLIB_MAJOR= 1
+SRCS= connection.c \
+ genacl.c \
+ hashtable.c \
+ log.c \
+ pack.c \
+ request.c \
+ rfuncs.c \
+ threadpool.c \
+ utils.c \
+ backend/fs.c \
+ transport/socket.c
+
+INCSDIR= ${INCLUDEDIR}/lib9p
+INCS= fid.h lib9p.h backend/fs.h
+
+LIBADD=sbuf
+
+.include
Modified: head/share/mk/bsd.libnames.mk
==
--- head/share/mk/bsd.libnames.mk Sat Oct 3 18:52:54 2020
(r366412)
+++ head/share/mk/bsd.libnames.mk Sat Oct 3 19:05:13 2020
(r366413)
@@ -17,6 +17,7 @@ LIBDESTDIR= ${SYSROOT:U${DESTDIR}}
LIBCRT0?= ${LIBDESTDIR}${LIBDIR_BASE}/crt0.o
LIB80211?= ${LIBDESTDIR}${LIBDIR_BASE}/lib80211.a
+LIB9P?=${LIBDESTDIR}${LIBDIR_BASE}/lib9p.a
LIBALIAS?= ${LIBDESTDIR}${LIBDIR_BASE}/libalias.a
LIBARCHIVE?= ${LIBDESTDIR}${LIBDIR_BASE}/libarchive.a
LIBASN1?= ${LIBDESTDIR}${LIBDIR_BASE}/libasn1.a
Modified: head/share/mk/src.libnames.mk
==
--- head/share/mk/src.libnames.mk Sat Oct 3 18:52:54 2020
(r366412)
+++ head/share/mk/src.libnames.mk Sat Oct 3 19:05:13 2020
(r366413)
@@ -70,6 +70,7 @@ _LIBRARIES= \
${_INTERNALLIBS} \
${LOCAL_LIBRARIES} \
80211 \
+ 9p \
alias \
archive \
asn1 \
@@ -246,6 +247,7 @@ LIBVERIEXEC?= ${LIBVERIEXECDIR}/libveriexec.a
# Each library's LIBADD needs to be duplicated here for static linkage of
# 2nd+ order consumers. Auto-generating this would be better.
_DP_80211= sbuf bsdxml
+_DP_9p=sbuf
_DP_archive= z bz2 lzma bsdxml zstd
_DP_zstd= pthread
.if ${MK_BLACKLIST} != "no"
Modified: head/usr.sbin/bhyve/Makefile
==
--- head/usr.sbin/bhyve/MakefileSat Oct 3 18:52:54 2020
(r366412)
+++ head/usr.sbin/bhyve/MakefileSat Oct 3 19:05:13 2020
(r366413)
@@ -3,6 +3,7 @@
#
.include
+CFLAGS+=-I${.CURDIR}/../../contrib/lib9p
CFLAGS+=-I${SRCTOP}/sys
.PATH: ${SRCTOP}/sys/cam/ctl
@@ -47,6 +48,7 @@ SRCS= \
pci_lpc.c \
pci_nvme.c \
pci_passthru.c \
+ pci_virtio_9p.c \
pci_virtio
svn commit: r366414 - head/usr.bin/cpuset
Author: gbe (doc committer) Date: Sat Oct 3 19:10:54 2020 New Revision: 366414 URL: https://svnweb.freebsd.org/changeset/base/366414 Log: cpuset(1): Fix some issues reported by mandoc - whitespace at end of input line - new sentence, new line MFC after:1 week Modified: head/usr.bin/cpuset/cpuset.1 Modified: head/usr.bin/cpuset/cpuset.1 == --- head/usr.bin/cpuset/cpuset.1Sat Oct 3 19:05:13 2020 (r366413) +++ head/usr.bin/cpuset/cpuset.1Sat Oct 3 19:10:54 2020 (r366414) @@ -34,24 +34,24 @@ .Sh SYNOPSIS .Nm .Op Fl l Ar cpu-list -.Op Fl n Ar policy:domain-list +.Op Fl n Ar policy:domain-list .Op Fl s Ar setid .Ar cmd ... .Nm .Op Fl l Ar cpu-list -.Op Fl n Ar policy:domain-list +.Op Fl n Ar policy:domain-list .Op Fl s Ar setid .Fl p Ar pid .Nm .Op Fl c .Op Fl l Ar cpu-list -.Op Fl n Ar policy:domain-list +.Op Fl n Ar policy:domain-list .Fl C .Fl p Ar pid .Nm .Op Fl c .Op Fl l Ar cpu-list -.Op Fl n Ar policy:domain-list +.Op Fl n Ar policy:domain-list .Op Fl j Ar jail | Fl p Ar pid | Fl t Ar tid | Fl s Ar setid | Fl x Ar irq .Nm .Fl g @@ -97,8 +97,8 @@ This last set is the list of all possible CPUs in the queried using .Fl r . .Pp -Most sets include NUMA memory domain and policy information. This can be -inspected with +Most sets include NUMA memory domain and policy information. +This can be inspected with .Fl g and set with .Fl n . @@ -124,8 +124,8 @@ Create a new cpuset and assign the target process to t The requested operation should reference the cpuset available via the target specifier. .It Fl d Ar domain -Specifies a NUMA domain id as the target of the operation. This can only -be used to query the cpus visible in each numberd domain. +Specifies a NUMA domain id as the target of the operation. +This can only be used to query the cpus visible in each numberd domain. .It Fl g Causes .Nm @@ -146,8 +146,8 @@ A special list of .Dq all may be specified in which case the list includes all CPUs from the root set. .It Fl n Ar policy:domain-list -Specifies a list of domains and allocation policy to apply to a target. Ranges -may be specified as in +Specifies a list of domains and allocation policy to apply to a target. +Ranges may be specified as in .Fl l . Valid policies include first-touch (ft), round-robin (rr), prefer and interleave (il). ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r366403 - head/bin/ls
On Sat, Oct 03, 2020 at 09:47:48PM +0300, xto...@hotmail.com wrote: > Gordon Bergling wrote: > > Author: gbe (doc committer) > > Date: Sat Oct 3 18:34:24 2020 > > New Revision: 366403 > > URL: https://svnweb.freebsd.org/changeset/base/366403 > > > > Log: > >ls(1): Bugfix for an issue reported by mandoc > > > >- no blank before trailing delimiter > > > >MFC after: 1 week > > > > Modified: > >head/bin/ls/ls.1 > > > > Modified: head/bin/ls/ls.1 > > == > > --- head/bin/ls/ls.1Sat Oct 3 18:30:01 2020(r366402) > > +++ head/bin/ls/ls.1Sat Oct 3 18:34:24 2020(r366403) > > @@ -40,7 +40,7 @@ > > .Nd list directory contents > > .Sh SYNOPSIS > > .Nm > > -.Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1, > > +.Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1 , > > This makes the "," appear after the "]", how about using the following > instead: > > .Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1\&, The comma is appearing right before the ']', like it was before. I'll check the recommended syntax regarding '\&' tomorrow. Thank you, Gordon Bergling ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r366403 - head/bin/ls
Gordon Bergling wrote: On Sat, Oct 03, 2020 at 09:47:48PM +0300, xto...@hotmail.com wrote: Gordon Bergling wrote: Author: gbe (doc committer) Date: Sat Oct 3 18:34:24 2020 New Revision: 366403 URL: https://svnweb.freebsd.org/changeset/base/366403 Log: ls(1): Bugfix for an issue reported by mandoc - no blank before trailing delimiter MFC after: 1 week Modified: head/bin/ls/ls.1 Modified: head/bin/ls/ls.1 == --- head/bin/ls/ls.1Sat Oct 3 18:30:01 2020(r366402) +++ head/bin/ls/ls.1Sat Oct 3 18:34:24 2020(r366403) @@ -40,7 +40,7 @@ .Nd list directory contents .Sh SYNOPSIS .Nm -.Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1, +.Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1 , This makes the "," appear after the "]", how about using the following instead: .Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1\&, The comma is appearing right before the ']', like it was before. I'll check the recommended syntax regarding '\&' tomorrow. That's not what I'm seeing: polaris:xtouqh:/usr/src$ svnlite info bin/ls/ls.1 Path: bin/ls/ls.1 Name: ls.1 Working Copy Root Path: /usr/src URL: svn://svn.freebsd.org/base/head/bin/ls/ls.1 Relative URL: ^/head/bin/ls/ls.1 Repository Root: svn://svn.freebsd.org/base Repository UUID: ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f Revision: 366414 Node Kind: file Schedule: normal Last Changed Author: gbe Last Changed Rev: 366403 Last Changed Date: 2020-10-03 18:34:24 + (Sat, 03 Oct 2020) Text Last Updated: 2020-10-03 18:51:31 + (Sat, 03 Oct 2020) Checksum: 72fe092ab2b5ac3363ea0681cfda216876d24fcd $ man bin/ls/ls.1 | head LS(1) FreeBSD General Commands Manual LS(1) NAME ls – list directory contents SYNOPSIS ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1], [--color=when] [-D format] [file ...] DESCRIPTION ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366415 - in head/sys: amd64/include x86/include
Author: kib Date: Sat Oct 3 23:07:09 2020 New Revision: 366415 URL: https://svnweb.freebsd.org/changeset/base/366415 Log: Move ctx_switch_xsave declaration to amd64 md_var.h. Sponsored by: The FreeBSD Foundation MFC after:3 days Modified: head/sys/amd64/include/md_var.h head/sys/x86/include/x86_var.h Modified: head/sys/amd64/include/md_var.h == --- head/sys/amd64/include/md_var.h Sat Oct 3 19:10:54 2020 (r366414) +++ head/sys/amd64/include/md_var.h Sat Oct 3 23:07:09 2020 (r366415) @@ -36,6 +36,7 @@ #include +extern charctx_switch_xsave[]; extern int hw_lower_amd64_sharedpage; extern int hw_ibrs_disable; extern int hw_ssb_disable; Modified: head/sys/x86/include/x86_var.h == --- head/sys/x86/include/x86_var.h Sat Oct 3 19:10:54 2020 (r366414) +++ head/sys/x86/include/x86_var.h Sat Oct 3 23:07:09 2020 (r366415) @@ -71,7 +71,6 @@ externu_int cpu_power_eax; extern u_int cpu_power_ebx; extern u_int cpu_power_ecx; extern u_int cpu_power_edx; -extern charctx_switch_xsave[]; extern u_int hv_base; extern u_int hv_high; extern charhv_vendor[]; ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366416 - head/sys/amd64/amd64
Author: kib
Date: Sat Oct 3 23:11:20 2020
New Revision: 366416
URL: https://svnweb.freebsd.org/changeset/base/366416
Log:
Fix pmap_pti_add_kva() call for doublefault stack page.
After r354889 stack got struct nmi_pcpu at top, which makes IST top
not page-aligned. Since pmap_pti_add_kva() truncates/rounds up
addresses, it erronously entered a page mapped before double fault
stack into the pti page table.
Sponsored by: The FreeBSD Foundation
MFC after:3 days
Modified:
head/sys/amd64/amd64/pmap.c
Modified: head/sys/amd64/amd64/pmap.c
==
--- head/sys/amd64/amd64/pmap.c Sat Oct 3 23:07:09 2020(r366415)
+++ head/sys/amd64/amd64/pmap.c Sat Oct 3 23:11:20 2020(r366416)
@@ -10479,7 +10479,7 @@ pmap_pti_init(void)
sizeof(struct gate_descriptor) * NIDT, false);
CPU_FOREACH(i) {
/* Doublefault stack IST 1 */
- va = __pcpu[i].pc_common_tss.tss_ist1;
+ va = __pcpu[i].pc_common_tss.tss_ist1 + sizeof(struct nmi_pcpu);
pmap_pti_add_kva_locked(va - PAGE_SIZE, va, false);
/* NMI stack IST 2 */
va = __pcpu[i].pc_common_tss.tss_ist2 + sizeof(struct nmi_pcpu);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366417 - in head/sys/amd64: amd64 include
Author: kib
Date: Sat Oct 3 23:17:29 2020
New Revision: 366417
URL: https://svnweb.freebsd.org/changeset/base/366417
Log:
amd64: Store full 64bit of FIP/FDP for 64bit processes when using XSAVE.
If current process is 64bit, use rex-prefixed version of XSAVE
(XSAVE64). If current process is 32bit and CPU supports saving
segment registers cs/ds in the FPU save area, use non-prefixed variant
of XSAVE.
Reported and tested by: Michał Górny
PR: 250043
Reviewed by: emaste, markj
Sponsored by: The FreeBSD Foundation
MFC after:1 week
Differential revision:https://reviews.freebsd.org/D26643
Modified:
head/sys/amd64/amd64/cpu_switch.S
head/sys/amd64/amd64/fpu.c
head/sys/amd64/include/md_var.h
Modified: head/sys/amd64/amd64/cpu_switch.S
==
--- head/sys/amd64/amd64/cpu_switch.S Sat Oct 3 23:11:20 2020
(r366416)
+++ head/sys/amd64/amd64/cpu_switch.S Sat Oct 3 23:17:29 2020
(r366417)
@@ -116,22 +116,25 @@ done_store_dr:
/* have we used fp, and need a save? */
cmpq%rdi,PCPU(FPCURTHREAD)
- jne 2f
- movqPCB_SAVEFPU(%r8),%r8
+ jne ctx_switch_fpusave_done
+ movqPCB_SAVEFPU(%r8),%r9
clts
cmpl$0,use_xsave(%rip)
jne 1f
- fxsave (%r8)
- jmp 2f
+ fxsave (%r9)
+ jmp ctx_switch_fpusave_done
1: movq%rdx,%rcx
movlxsave_mask,%eax
movlxsave_mask+4,%edx
+ testl $PCB_32BIT,PCB_FLAGS(%r8)
+ jne ctx_switch_xsave32
.globl ctx_switch_xsave
ctx_switch_xsave:
/* This is patched to xsaveopt if supported, see fpuinit_bsp1() */
- xsave (%r8)
+ xsave64 (%r9)
+ctx_switch_xsave_done:
movq%rcx,%rdx
-2:
+ctx_switch_fpusave_done:
/* Save is done. Now fire up new thread. Leave old vmspace. */
movq%rsi,%r12
movq%rdi,%r13
@@ -294,6 +297,11 @@ do_ldt:movqPCPU(LDT),%rax
movq%rdx,8(%rax)
movl$LDTSEL,%eax
jmp ld_ldt
+
+ .globl ctx_switch_xsave32
+ctx_switch_xsave32:
+ xsave (%r9)
+ jmp ctx_switch_xsave_done
END(cpu_switch)
/*
Modified: head/sys/amd64/amd64/fpu.c
==
--- head/sys/amd64/amd64/fpu.c Sat Oct 3 23:11:20 2020(r366416)
+++ head/sys/amd64/amd64/fpu.c Sat Oct 3 23:17:29 2020(r366417)
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
#include
@@ -81,7 +82,7 @@ __FBSDID("$FreeBSD$");
#definestmxcsr(addr) __asm __volatile("stmxcsr %0" : : "m"
(*(addr)))
static __inline void
-xrstor(char *addr, uint64_t mask)
+xrstor32(char *addr, uint64_t mask)
{
uint32_t low, hi;
@@ -91,27 +92,59 @@ xrstor(char *addr, uint64_t mask)
}
static __inline void
-xsave(char *addr, uint64_t mask)
+xrstor64(char *addr, uint64_t mask)
{
uint32_t low, hi;
low = mask;
hi = mask >> 32;
+ __asm __volatile("xrstor64 %0" : : "m" (*addr), "a" (low), "d" (hi));
+}
+
+static __inline void
+xsave32(char *addr, uint64_t mask)
+{
+ uint32_t low, hi;
+
+ low = mask;
+ hi = mask >> 32;
__asm __volatile("xsave %0" : "=m" (*addr) : "a" (low), "d" (hi) :
"memory");
}
static __inline void
-xsaveopt(char *addr, uint64_t mask)
+xsave64(char *addr, uint64_t mask)
{
uint32_t low, hi;
low = mask;
hi = mask >> 32;
+ __asm __volatile("xsave64 %0" : "=m" (*addr) : "a" (low), "d" (hi) :
+ "memory");
+}
+
+static __inline void
+xsaveopt32(char *addr, uint64_t mask)
+{
+ uint32_t low, hi;
+
+ low = mask;
+ hi = mask >> 32;
__asm __volatile("xsaveopt %0" : "=m" (*addr) : "a" (low), "d" (hi) :
"memory");
}
+static __inline void
+xsaveopt64(char *addr, uint64_t mask)
+{
+ uint32_t low, hi;
+
+ low = mask;
+ hi = mask >> 32;
+ __asm __volatile("xsaveopt64 %0" : "=m" (*addr) : "a" (low), "d" (hi) :
+ "memory");
+}
+
#else /* !(__GNUCLIKE_ASM && !lint) */
void fldcw(u_short cw);
@@ -123,9 +156,12 @@ void fxsave(caddr_t addr);
void fxrstor(caddr_t addr);
void ldmxcsr(u_int csr);
void stmxcsr(u_int *csr);
-void xrstor(char *addr, uint64_t mask);
-void xsave(char *addr, uint64_t mask);
-void xsaveopt(char *addr, uint64_t mask);
+void xrstor32(char *addr, uint64_t mask);
+void xrstor64(char *addr, uint64_t mask);
+void xsave32(char *addr, uint64_t mask);
+void xsave64(char *addr, uint64_t mask);
+void xsaveopt32(char *addr, uint64_t mask);
+void xsaveopt64(char *addr, uint64_t mask);
#endif /* __GNUCLIKE_ASM && !lint */
@@ -166,24 +202,48 @@ static struct xsave_area_elm_descr {
} *xsave_area_desc;
static void
-fpu
svn commit: r366418 - stable/12/usr.bin/procstat
Author: kib
Date: Sun Oct 4 00:40:28 2020
New Revision: 366418
URL: https://svnweb.freebsd.org/changeset/base/366418
Log:
MFC r366210:
Consistently use __FBSDID("FreeBSD") for ids in usr.bin/procstat.
Modified:
stable/12/usr.bin/procstat/procstat.c
stable/12/usr.bin/procstat/procstat_args.c
stable/12/usr.bin/procstat/procstat_auxv.c
stable/12/usr.bin/procstat/procstat_basic.c
stable/12/usr.bin/procstat/procstat_bin.c
stable/12/usr.bin/procstat/procstat_cred.c
stable/12/usr.bin/procstat/procstat_cs.c
stable/12/usr.bin/procstat/procstat_files.c
stable/12/usr.bin/procstat/procstat_kstack.c
stable/12/usr.bin/procstat/procstat_ptlwpinfo.c
stable/12/usr.bin/procstat/procstat_rlimit.c
stable/12/usr.bin/procstat/procstat_sigs.c
stable/12/usr.bin/procstat/procstat_threads.c
stable/12/usr.bin/procstat/procstat_vm.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/usr.bin/procstat/procstat.c
==
--- stable/12/usr.bin/procstat/procstat.c Sat Oct 3 23:17:29 2020
(r366417)
+++ stable/12/usr.bin/procstat/procstat.c Sun Oct 4 00:40:28 2020
(r366418)
@@ -26,9 +26,10 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD$
*/
+
+#include
+__FBSDID("$FreeBSD$");
#include
#include
Modified: stable/12/usr.bin/procstat/procstat_args.c
==
--- stable/12/usr.bin/procstat/procstat_args.c Sat Oct 3 23:17:29 2020
(r366417)
+++ stable/12/usr.bin/procstat/procstat_args.c Sun Oct 4 00:40:28 2020
(r366418)
@@ -25,9 +25,10 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD$
*/
+
+#include
+__FBSDID("$FreeBSD$");
#include
#include
Modified: stable/12/usr.bin/procstat/procstat_auxv.c
==
--- stable/12/usr.bin/procstat/procstat_auxv.c Sat Oct 3 23:17:29 2020
(r366417)
+++ stable/12/usr.bin/procstat/procstat_auxv.c Sun Oct 4 00:40:28 2020
(r366418)
@@ -25,9 +25,10 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD$
*/
+
+#include
+__FBSDID("$FreeBSD$");
#include
#include
Modified: stable/12/usr.bin/procstat/procstat_basic.c
==
--- stable/12/usr.bin/procstat/procstat_basic.c Sat Oct 3 23:17:29 2020
(r366417)
+++ stable/12/usr.bin/procstat/procstat_basic.c Sun Oct 4 00:40:28 2020
(r366418)
@@ -25,9 +25,10 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD$
*/
+
+#include
+__FBSDID("$FreeBSD$");
#include
#include
Modified: stable/12/usr.bin/procstat/procstat_bin.c
==
--- stable/12/usr.bin/procstat/procstat_bin.c Sat Oct 3 23:17:29 2020
(r366417)
+++ stable/12/usr.bin/procstat/procstat_bin.c Sun Oct 4 00:40:28 2020
(r366418)
@@ -25,9 +25,10 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD$
*/
+
+#include
+__FBSDID("$FreeBSD$");
#include
#include
Modified: stable/12/usr.bin/procstat/procstat_cred.c
==
--- stable/12/usr.bin/procstat/procstat_cred.c Sat Oct 3 23:17:29 2020
(r366417)
+++ stable/12/usr.bin/procstat/procstat_cred.c Sun Oct 4 00:40:28 2020
(r366418)
@@ -25,9 +25,10 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD$
*/
+
+#include
+__FBSDID("$FreeBSD$");
#include
#include
Modified: stable/12/usr.bin/procstat/procstat_cs.c
==
--- stable/12/usr.bin/procstat/procstat_cs.cSat Oct 3 23:17:29 2020
(r366417)
+++ stable/12/usr.bin/procstat/procstat_cs.cSun Oct 4 00:40:28 2020
(r366418)
@@ -23,9 +23,10 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD$
*/
+
+#include
+__FBSDID("$FreeBSD$");
#inclu
svn commit: r366419 - releng/12.2/sys/netgraph/bluetooth/include
Author: kevans
Date: Sun Oct 4 01:39:29 2020
New Revision: 366419
URL: https://svnweb.freebsd.org/changeset/base/366419
Log:
MFS r366395: Fix Typo in ng_hci_le_connection_complete_ep struct.
Approved by: re (gjb)
Modified:
releng/12.2/sys/netgraph/bluetooth/include/ng_hci.h
Directory Properties:
releng/12.2/ (props changed)
Modified: releng/12.2/sys/netgraph/bluetooth/include/ng_hci.h
==
--- releng/12.2/sys/netgraph/bluetooth/include/ng_hci.h Sun Oct 4 00:40:28
2020(r366418)
+++ releng/12.2/sys/netgraph/bluetooth/include/ng_hci.h Sun Oct 4 01:39:29
2020(r366419)
@@ -1955,7 +1955,7 @@ typedef struct {
u_int16_t interval;
u_int8_tlatency;
u_int16_t supervision_timeout;
- u_int8_tmaster_clock_accracy;
+ u_int8_tmaster_clock_accuracy;
} __attribute__ ((packed)) ng_hci_le_connection_complete_ep;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366420 - in stable: 11/contrib/ipfilter/ipsend 12/contrib/ipfilter/ipsend
Author: cy Date: Sun Oct 4 03:31:35 2020 New Revision: 366420 URL: https://svnweb.freebsd.org/changeset/base/366420 Log: MFC r366202: Continuing the effort started in r343701, #ifdef cleanup, remove never to be used again checks. Modified: stable/11/contrib/ipfilter/ipsend/iptests.c Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/12/contrib/ipfilter/ipsend/iptests.c Directory Properties: stable/12/ (props changed) Modified: stable/11/contrib/ipfilter/ipsend/iptests.c == --- stable/11/contrib/ipfilter/ipsend/iptests.c Sun Oct 4 01:39:29 2020 (r366419) +++ stable/11/contrib/ipfilter/ipsend/iptests.c Sun Oct 4 03:31:35 2020 (r366420) @@ -27,7 +27,7 @@ typedef int boolean_t; # endif # define _KERNEL # define KERNEL -# if !defined(solaris) && !defined(linux) && !defined(__sgi) && !defined(hpux) +# if !defined(solaris) # include # else # ifdef solaris ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366420 - in stable: 11/contrib/ipfilter/ipsend 12/contrib/ipfilter/ipsend
Author: cy Date: Sun Oct 4 03:31:35 2020 New Revision: 366420 URL: https://svnweb.freebsd.org/changeset/base/366420 Log: MFC r366202: Continuing the effort started in r343701, #ifdef cleanup, remove never to be used again checks. Modified: stable/12/contrib/ipfilter/ipsend/iptests.c Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/11/contrib/ipfilter/ipsend/iptests.c Directory Properties: stable/11/ (props changed) Modified: stable/12/contrib/ipfilter/ipsend/iptests.c == --- stable/12/contrib/ipfilter/ipsend/iptests.c Sun Oct 4 01:39:29 2020 (r366419) +++ stable/12/contrib/ipfilter/ipsend/iptests.c Sun Oct 4 03:31:35 2020 (r366420) @@ -27,7 +27,7 @@ typedef int boolean_t; # endif # define _KERNEL # define KERNEL -# if !defined(solaris) && !defined(linux) && !defined(__sgi) && !defined(hpux) +# if !defined(solaris) # include # else # ifdef solaris ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366421 - in stable: 11/contrib/ipfilter/ipsend 12/contrib/ipfilter/ipsend
Author: cy Date: Sun Oct 4 03:33:05 2020 New Revision: 366421 URL: https://svnweb.freebsd.org/changeset/base/366421 Log: MFC r366203: Remove Linux and IRIX specific files. Deleted: stable/11/contrib/ipfilter/ipsend/larp.c stable/11/contrib/ipfilter/ipsend/linux.h stable/11/contrib/ipfilter/ipsend/lsock.c stable/11/contrib/ipfilter/ipsend/sirix.c stable/11/contrib/ipfilter/ipsend/slinux.c Modified: Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Deleted: stable/12/contrib/ipfilter/ipsend/larp.c stable/12/contrib/ipfilter/ipsend/linux.h stable/12/contrib/ipfilter/ipsend/lsock.c stable/12/contrib/ipfilter/ipsend/sirix.c stable/12/contrib/ipfilter/ipsend/slinux.c Modified: Directory Properties: stable/12/ (props changed) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366421 - in stable: 11/contrib/ipfilter/ipsend 12/contrib/ipfilter/ipsend
Author: cy Date: Sun Oct 4 03:33:05 2020 New Revision: 366421 URL: https://svnweb.freebsd.org/changeset/base/366421 Log: MFC r366203: Remove Linux and IRIX specific files. Deleted: stable/12/contrib/ipfilter/ipsend/larp.c stable/12/contrib/ipfilter/ipsend/linux.h stable/12/contrib/ipfilter/ipsend/lsock.c stable/12/contrib/ipfilter/ipsend/sirix.c stable/12/contrib/ipfilter/ipsend/slinux.c Modified: Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Deleted: stable/11/contrib/ipfilter/ipsend/larp.c stable/11/contrib/ipfilter/ipsend/linux.h stable/11/contrib/ipfilter/ipsend/lsock.c stable/11/contrib/ipfilter/ipsend/sirix.c stable/11/contrib/ipfilter/ipsend/slinux.c Modified: Directory Properties: stable/11/ (props changed) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366422 - stable/12/stand/lua
Author: imp
Date: Sun Oct 4 06:12:52 2020
New Revision: 366422
URL: https://svnweb.freebsd.org/changeset/base/366422
Log:
MFC: r366228
Report the kernel console on the boot screen
Report what console the boot loader is telling the kernel to use:
o Dual (Serial Primary)
o Dual (Video Primary)
o Serial
o Video
and allow toggling between them.
Modified:
stable/12/stand/lua/core.lua
stable/12/stand/lua/menu.lua
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/stand/lua/core.lua
==
--- stable/12/stand/lua/core.luaSun Oct 4 03:33:05 2020
(r366421)
+++ stable/12/stand/lua/core.luaSun Oct 4 06:12:52 2020
(r366422)
@@ -410,6 +410,40 @@ function core.popFrontTable(tbl)
return first_value, new_tbl
end
+function core.getConsoleName()
+ if loader.getenv("boot_multicons") ~= nil then
+ if loader.getenv("boot_serial") ~= nil then
+ return "Dual (Serial primary)"
+ else
+ return "Dual (Video primary)"
+ end
+ else
+ if loader.getenv("boot_serial") ~= nil then
+ return "Serial"
+ else
+ return "Video"
+ end
+ end
+end
+
+function core.nextConsoleChoice()
+ if loader.getenv("boot_multicons") ~= nil then
+ if loader.getenv("boot_serial") ~= nil then
+ loader.unsetenv("boot_serial")
+ else
+ loader.unsetenv("boot_multicons")
+ loader.setenv("boot_serial", "YES")
+ end
+ else
+ if loader.getenv("boot_serial") ~= nil then
+ loader.unsetenv("boot_serial")
+ else
+ loader.setenv("boot_multicons", "YES")
+ loader.setenv("boot_serial", "YES")
+ end
+ end
+end
+
recordDefaults()
hook.register("config.reloaded", core.clearCachedKernels)
return core
Modified: stable/12/stand/lua/menu.lua
==
--- stable/12/stand/lua/menu.luaSun Oct 4 03:33:05 2020
(r366421)
+++ stable/12/stand/lua/menu.luaSun Oct 4 06:12:52 2020
(r366422)
@@ -241,6 +241,7 @@ menu.welcome = {
boot_entry_2,
menu_entries.prompt,
menu_entries.reboot,
+ menu_entries.console,
{
entry_type = core.MENU_SEPARATOR,
},
@@ -279,6 +280,16 @@ menu.welcome = {
core.boot()
end,
alias = {"s", "S"},
+ },
+ console = {
+ entry_type = core.MENU_ENTRY,
+ name = function()
+ return color.highlight("C") .. "ons: " ..
core.getConsoleName()
+ end,
+ func = function()
+ core.nextConsoleChoice()
+ end,
+ alias = {"c", "C"},
},
prompt = {
entry_type = core.MENU_RETURN,
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366423 - stable/12/sys/kern
Author: imp
Date: Sun Oct 4 06:14:51 2020
New Revision: 366423
URL: https://svnweb.freebsd.org/changeset/base/366423
Log:
MFC: r366229
For mulitcons boot, report it and which console is primary
Until we can do proper /etc/rc output on both consoles in multicons
boot (or all of them if we ever generalize), report when we are
booting multicons. Also report the primary console. This will be a big
hint why output stops after this line (though some slow USB discovery
still happens after mountroot / init starts).
Reviewed by: scottl@, tsoome@
Differential Revision: https://reviews.freebsd.org/D26574
Modified:
stable/12/sys/kern/init_main.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/kern/init_main.c
==
--- stable/12/sys/kern/init_main.c Sun Oct 4 06:12:52 2020
(r366422)
+++ stable/12/sys/kern/init_main.c Sun Oct 4 06:14:51 2020
(r366423)
@@ -743,6 +743,14 @@ start_init(void *dummy)
p->p_vmspace->vm_maxsaddr = (caddr_t)addr;
p->p_vmspace->vm_ssize = 1;
+ /* For Multicons, report which console is primary to both */
+ if (boothowto & RB_MULTIPLE) {
+ if (boothowto & RB_SERIAL)
+ printf("Dual Console: Serial Primary, Video
Secondary\n");
+ else
+ printf("Dual Console: Video Primary, Serial
Secondary\n");
+ }
+
if ((var = kern_getenv("init_path")) != NULL) {
strlcpy(init_path, var, sizeof(init_path));
freeenv(var);
@@ -753,7 +761,7 @@ start_init(void *dummy)
pathlen = strlen(path) + 1;
if (bootverbose)
printf("start_init: trying %s\n", path);
-
+
/*
* Move out the boot flag argument.
*/
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
