date:20200123

Author: emaste
Date: Thu Jan 23 14:11:02 2020
New Revision: 357045
URL: https://svnweb.freebsd.org/changeset/base/357045

Log:
  Apply r355819 to sparc64 - fix assertion failure after r355784
  
  From r355819:
  Repeat the spinlock_enter/exit pattern from amd64 on other architectures
  to fix an assert violation introduced in r355784.  Without this
  spinlock_exit() may see owepreempt and switch before reducing the
  spinlock count.  amd64 had been optimized to do a single critical
  enter/exit regardless of the number of spinlocks which avoided the
  problem and this optimization had not been applied elsewhere.
  
  This is completely untested - I have no obsolete Sparc hardware - but
  someone did try testing recent changes on sparc64 (PR 243534).
  
  PR:   243534

Modified:
  head/sys/sparc64/sparc64/machdep.c

Modified: head/sys/sparc64/sparc64/machdep.c
==
--- head/sys/sparc64/sparc64/machdep.c  Thu Jan 23 14:01:03 2020
(r357044)
+++ head/sys/sparc64/sparc64/machdep.c  Thu Jan 23 14:11:02 2020
(r357045)
@@ -224,9 +224,9 @@ spinlock_enter(void)
wrpr(pil, 0, PIL_TICK);
td->td_md.md_spinlock_count = 1;
td->td_md.md_saved_pil = pil;
+   critical_enter();
} else
td->td_md.md_spinlock_count++;
-   critical_enter();
 }
 
 void
@@ -236,11 +236,12 @@ spinlock_exit(void)
register_t pil;
 
td = curthread;
-   critical_exit();
pil = td->td_md.md_saved_pil;
td->td_md.md_spinlock_count--;
-   if (td->td_md.md_spinlock_count == 0)
+   if (td->td_md.md_spinlock_count == 0) {
+   critical_exit();
wrpr(pil, pil, 0);
+   }
 }
 
 static phandle_t
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r356990 - head/etc

On Wed, 22 Jan 2020 at 13:40, Ed Maste  wrote:
>
> Author: emaste
> Date: Wed Jan 22 18:40:19 2020
> New Revision: 356990
> URL: https://svnweb.freebsd.org/changeset/base/356990
>
> Log:
>   Tag NLS aliases with package=runtime

This commit message does not match the change, it should be
'package=utilities'. The symlink is tagged 'package=utilities'
matching the NLS data in /usr/share/locale/...
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r357047 - head/tests

Author: emaste
Date: Thu Jan 23 15:59:30 2020
New Revision: 357047
URL: https://svnweb.freebsd.org/changeset/base/357047

Log:
  Tag /usr/tests/local symlink with package=tests
  
  As with the rest of /usr/tests, so that it is handled correctly on
  pkgbase-installed/updated systems.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/tests/Makefile

Modified: head/tests/Makefile
==
--- head/tests/Makefile Thu Jan 23 14:14:38 2020(r357046)
+++ head/tests/Makefile Thu Jan 23 15:59:30 2020(r357047)
@@ -15,7 +15,8 @@ SUBDIR_PARALLEL=
 
 afterinstall: install-tests-local
 install-tests-local: .PHONY
-   ${INSTALL_SYMLINK} ../local/tests ${DESTDIR}${TESTSDIR}/local
+   ${INSTALL_SYMLINK} -T 'package=tests' \
+   ../local/tests ${DESTDIR}${TESTSDIR}/local
 
 .include "Makefile.inc0"
 .include 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r357048 - head/sys/arm64/arm64

Author: markj
Date: Thu Jan 23 16:07:27 2020
New Revision: 357048
URL: https://svnweb.freebsd.org/changeset/base/357048

Log:
  arm64: Don't enable interrupts in init_secondary().
  
  Doing so can cause deadlocks or panics during boot, if an interrupt
  handler accesses uninitialized per-CPU scheduler structures.  This seems
  to occur frequently when running under QEMU or AWS.  The idle threads
  are set up to release a spinlock section and enable interrupts in
  fork_exit(), so there is no need to enable interrupts earlier.
  
  Reviewed by:  kib
  MFC after:1 week
  Sponsored by: The FreeBSD Foundation
  Differential Revision:https://reviews.freebsd.org/D23328

Modified:
  head/sys/arm64/arm64/mp_machdep.c

Modified: head/sys/arm64/arm64/mp_machdep.c
==
--- head/sys/arm64/arm64/mp_machdep.c   Thu Jan 23 15:59:30 2020
(r357047)
+++ head/sys/arm64/arm64/mp_machdep.c   Thu Jan 23 16:07:27 2020
(r357048)
@@ -240,18 +240,12 @@ init_secondary(uint64_t cpu)
dbg_init();
pan_enable();
 
-   /* Enable interrupts */
-   intr_enable();
-
mtx_lock_spin(&ap_boot_mtx);
-
atomic_add_rel_32(&smp_cpus, 1);
-
if (smp_cpus == mp_ncpus) {
/* enable IPI's, tlb shootdown, freezes etc */
atomic_store_rel_int(&smp_started, 1);
}
-
mtx_unlock_spin(&ap_boot_mtx);
 
kcsan_cpu_init(cpu);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r357049 - in head/sys/arm64: arm64 include

Author: markj
Date: Thu Jan 23 16:10:38 2020
New Revision: 357049
URL: https://svnweb.freebsd.org/changeset/base/357049

Log:
  Print missing ID_AA64PFR{0,1}_EL1 register fields.
  
  MFC after:1 week
  Sponsored by: The FreeBSD Foundation
  Differential Revision:https://reviews.freebsd.org/D23213

Modified:
  head/sys/arm64/arm64/identcpu.c
  head/sys/arm64/include/armreg.h

Modified: head/sys/arm64/arm64/identcpu.c
==
--- head/sys/arm64/arm64/identcpu.c Thu Jan 23 16:07:27 2020
(r357048)
+++ head/sys/arm64/arm64/identcpu.c Thu Jan 23 16:10:38 2020
(r357049)
@@ -643,6 +643,41 @@ static struct mrs_field id_aa64mmfr2_fields[] = {
 
 
 /* ID_AA64PFR0_EL1 */
+static struct mrs_field_value id_aa64pfr0_csv3[] = {
+   MRS_FIELD_VALUE(ID_AA64PFR0_CSV3_NONE, ""),
+   MRS_FIELD_VALUE(ID_AA64PFR0_CSV3_ISOLATED, "CSV3"),
+   MRS_FIELD_VALUE_END,
+};
+
+static struct mrs_field_value id_aa64pfr0_csv2[] = {
+   MRS_FIELD_VALUE(ID_AA64PFR0_CSV2_NONE, ""),
+   MRS_FIELD_VALUE(ID_AA64PFR0_CSV2_ISOLATED, "CSV2"),
+   MRS_FIELD_VALUE(ID_AA64PFR0_CSV2_SCXTNUM, "SCXTNUM"),
+   MRS_FIELD_VALUE_END,
+};
+
+static struct mrs_field_value id_aa64pfr0_dit[] = {
+   MRS_FIELD_VALUE(ID_AA64PFR0_DIT_NONE, ""),
+   MRS_FIELD_VALUE(ID_AA64PFR0_DIT_PSTATE, "PSTATE.DIT"),
+   MRS_FIELD_VALUE_END,
+};
+
+static struct mrs_field_value id_aa64pfr0_amu[] = {
+   MRS_FIELD_VALUE(ID_AA64PFR0_AMU_NONE, ""),
+   MRS_FIELD_VALUE(ID_AA64PFR0_AMU_V1, "AMUv1"),
+   MRS_FIELD_VALUE_END,
+};
+
+static struct mrs_field_value id_aa64pfr0_mpam[] = {
+   MRS_FIELD_VALUE_NONE_IMPL(ID_AA64PFR0, MPAM, NONE, IMPL),
+   MRS_FIELD_VALUE_END,
+};
+
+static struct mrs_field_value id_aa64pfr0_sel2[] = {
+   MRS_FIELD_VALUE_NONE_IMPL(ID_AA64PFR0, SEL2, NONE, IMPL),
+   MRS_FIELD_VALUE_END,
+};
+
 static struct mrs_field_value id_aa64pfr0_sve[] = {
MRS_FIELD_VALUE_NONE_IMPL(ID_AA64PFR0, SVE, NONE, IMPL),
MRS_FIELD_VALUE_END,
@@ -696,6 +731,12 @@ static struct mrs_field_value id_aa64pfr0_el0[] = {
 };
 
 static struct mrs_field id_aa64pfr0_fields[] = {
+   MRS_FIELD(ID_AA64PFR0, CSV3, false, MRS_EXACT, id_aa64pfr0_csv3),
+   MRS_FIELD(ID_AA64PFR0, CSV2, false, MRS_EXACT, id_aa64pfr0_csv2),
+   MRS_FIELD(ID_AA64PFR0, DIT, false, MRS_EXACT, id_aa64pfr0_dit),
+   MRS_FIELD(ID_AA64PFR0, AMU, false, MRS_EXACT, id_aa64pfr0_amu),
+   MRS_FIELD(ID_AA64PFR0, MPAM, false, MRS_EXACT, id_aa64pfr0_mpam),
+   MRS_FIELD(ID_AA64PFR0, SEL2, false, MRS_EXACT, id_aa64pfr0_sel2),
MRS_FIELD(ID_AA64PFR0, SVE, false, MRS_EXACT, id_aa64pfr0_sve),
MRS_FIELD(ID_AA64PFR0, RAS, false, MRS_EXACT, id_aa64pfr0_ras),
MRS_FIELD(ID_AA64PFR0, GIC, false, MRS_EXACT, id_aa64pfr0_gic),
@@ -710,7 +751,30 @@ static struct mrs_field id_aa64pfr0_fields[] = {
 
 
 /* ID_AA64PFR1_EL1 */
+static struct mrs_field_value id_aa64pfr1_bt[] = {
+   MRS_FIELD_VALUE(ID_AA64PFR1_BT_NONE, ""),
+   MRS_FIELD_VALUE(ID_AA64PFR1_BT_IMPL, "BTI"),
+   MRS_FIELD_VALUE_END,
+};
+
+static struct mrs_field_value id_aa64pfr1_ssbs[] = {
+   MRS_FIELD_VALUE(ID_AA64PFR1_SSBS_NONE, ""),
+   MRS_FIELD_VALUE(ID_AA64PFR1_SSBS_PSTATE, "PSTATE.SSBS"),
+   MRS_FIELD_VALUE(ID_AA64PFR1_SSBS_PSTATE_MSR, "PSTATE.SSBS MSR"),
+   MRS_FIELD_VALUE_END,
+};
+
+static struct mrs_field_value id_aa64pfr1_mte[] = {
+   MRS_FIELD_VALUE(ID_AA64PFR1_MTE_NONE, ""),
+   MRS_FIELD_VALUE(ID_AA64PFR1_MTE_IMPL_EL0, "MTE EL0"),
+   MRS_FIELD_VALUE(ID_AA64PFR1_MTE_IMPL, "MTE"),
+   MRS_FIELD_VALUE_END,
+};
+
 static struct mrs_field id_aa64pfr1_fields[] = {
+   MRS_FIELD(ID_AA64PFR1, BT, false, MRS_EXACT, id_aa64pfr1_bt),
+   MRS_FIELD(ID_AA64PFR1, SSBS, false, MRS_EXACT, id_aa64pfr1_ssbs),
+   MRS_FIELD(ID_AA64PFR1, MTE, false, MRS_EXACT, id_aa64pfr1_mte),
MRS_FIELD_END,
 };
 
@@ -743,6 +807,13 @@ static struct mrs_user_reg user_regs[] = {
.Op2 = 0,
.offset = __offsetof(struct cpu_desc, id_aa64pfr0),
.fields = id_aa64pfr0_fields,
+   },
+   {   /* id_aa64pfr0_el1 */
+   .reg = ID_AA64PFR1_EL1,
+   .CRm = 4,
+   .Op2 = 1,
+   .offset = __offsetof(struct cpu_desc, id_aa64pfr1),
+   .fields = id_aa64pfr1_fields,
},
{   /* id_aa64dfr0_el1 */
.reg = ID_AA64DFR0_EL1,

Modified: head/sys/arm64/include/armreg.h
==
--- head/sys/arm64/include/armreg.h Thu Jan 23 16:07:27 2020
(r357048)
+++ head/sys/arm64/include/armreg.h Thu Jan 23 16:10:38 2020
(r357049)
@@ -517,6 +517,62 @@
 #defineID_AA64PFR0_SVE_VAL(x)  ((x) & ID_AA64PFR0_SVE_MASK)
 #define ID_AA64PFR0_SVE_NONE   (UL(0x0) << 
ID_AA64PFR0

svn commit: r357050 - head/sys/kern

Author: markj
Date: Thu Jan 23 16:24:51 2020
New Revision: 357050
URL: https://svnweb.freebsd.org/changeset/base/357050

Log:
  Set td_oncpu before dropping the thread lock during a switch.
  
  After r355784 we no longer hold a thread's thread lock when switching it
  out.  Preserve the previous synchronization protocol for td_oncpu by
  setting it together with td_state, before dropping the thread lock
  during a switch.
  
  Reported and tested by:   pho
  Reviewed by:  kib
  Discussed with:   jeff
  Differential Revision:https://reviews.freebsd.org/D23270

Modified:
  head/sys/kern/sched_ule.c

Modified: head/sys/kern/sched_ule.c
==
--- head/sys/kern/sched_ule.c   Thu Jan 23 16:10:38 2020(r357049)
+++ head/sys/kern/sched_ule.c   Thu Jan 23 16:24:51 2020(r357050)
@@ -2121,6 +2121,7 @@ sched_switch(struct thread *td, int flags)
 */
TDQ_LOCK_ASSERT(tdq, MA_OWNED | MA_NOTRECURSED);
newtd = choosethread();
+   newtd->td_oncpu = cpuid;
sched_pctcpu_update(td_get_sched(newtd), 0);
TDQ_UNLOCK(tdq);
 
@@ -2145,7 +2146,6 @@ sched_switch(struct thread *td, int flags)
 #endif
td->td_oncpu = NOCPU;
cpu_switch(td, newtd, mtx);
-   cpuid = td->td_oncpu = PCPU_GET(cpuid);
 
SDT_PROBE0(sched, , , on__cpu);
 #ifdef HWPMC_HOOKS
@@ -2915,6 +2915,7 @@ sched_throw(struct thread *td)
thread_lock_block(td);
}
newtd = choosethread();
+   newtd->td_oncpu = PCPU_GET(cpuid);
spinlock_enter();
TDQ_UNLOCK(tdq);
KASSERT(curthread->td_md.md_spinlock_count == 1,
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r357051 - head/sys/dev/bge

Author: glebius
Date: Thu Jan 23 16:36:58 2020
New Revision: 357051
URL: https://svnweb.freebsd.org/changeset/base/357051

Log:
  With MSI interrupts bge(4) just schedules taskqueue.  Enter the network
  epoch in the taskqueue handler.
  
  Reported by:  kib

Modified:
  head/sys/dev/bge/if_bge.c

Modified: head/sys/dev/bge/if_bge.c
==
--- head/sys/dev/bge/if_bge.c   Thu Jan 23 16:24:51 2020(r357050)
+++ head/sys/dev/bge/if_bge.c   Thu Jan 23 16:36:58 2020(r357051)
@@ -4646,6 +4646,7 @@ bge_msi_intr(void *arg)
 static void
 bge_intr_task(void *arg, int pending)
 {
+   struct epoch_tracker et;
struct bge_softc *sc;
if_t ifp;
uint32_t status, status_tag;
@@ -4688,7 +4689,9 @@ bge_intr_task(void *arg, int pending)
sc->bge_rx_saved_considx != rx_prod) {
/* Check RX return ring producer/consumer. */
BGE_UNLOCK(sc);
+   NET_EPOCH_ENTER(et);
bge_rxeof(sc, rx_prod, 0);
+   NET_EPOCH_EXIT(et);
BGE_LOCK(sc);
}
if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) {
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r357052 - head/sys/vm

Author: markj
Date: Thu Jan 23 16:45:10 2020
New Revision: 357052
URL: https://svnweb.freebsd.org/changeset/base/357052

Log:
  vm_map_submap(): Avoid unnecessary clipping.
  
  A submap can only be created from an entry spanning the entire request
  range.  In particular, if vm_map_lookup_entry() returns false or the
  returned entry contains "end".
  
  Since the only use of submaps in FreeBSD is for the static pipe and
  execve argument KVA maps, this has no functional effect.
  
  Github PR:https://github.com/freebsd/freebsd/pull/420
  Submitted by: Wuyang Chung  (original)
  Reviewed by:  dougm, kib
  MFC after:1 week
  Differential Revision:https://reviews.freebsd.org/D23299

Modified:
  head/sys/vm/vm_map.c

Modified: head/sys/vm/vm_map.c
==
--- head/sys/vm/vm_map.cThu Jan 23 16:36:58 2020(r357051)
+++ head/sys/vm/vm_map.cThu Jan 23 16:45:10 2020(r357052)
@@ -2477,19 +2477,12 @@ vm_map_submap(
vm_map_unlock(submap);
 
vm_map_lock(map);
-
VM_MAP_RANGE_CHECK(map, start, end);
-
-   if (vm_map_lookup_entry(map, start, &entry)) {
+   if (vm_map_lookup_entry(map, start, &entry) && entry->end >= end &&
+   (entry->eflags & MAP_ENTRY_COW) == 0 &&
+   entry->object.vm_object == NULL) {
vm_map_clip_start(map, entry, start);
-   } else
-   entry = vm_map_entry_succ(entry);
-
-   vm_map_clip_end(map, entry, end);
-
-   if ((entry->start == start) && (entry->end == end) &&
-   ((entry->eflags & MAP_ENTRY_COW) == 0) &&
-   (entry->object.vm_object == NULL)) {
+   vm_map_clip_end(map, entry, end);
entry->object.sub_map = submap;
entry->eflags |= MAP_ENTRY_IS_SUB_MAP;
result = KERN_SUCCESS;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r357053 - in head: share/man/man4 sys/netgraph

Author: markj
Date: Thu Jan 23 16:45:48 2020
New Revision: 357053
URL: https://svnweb.freebsd.org/changeset/base/357053

Log:
  ng_nat: Pass IPv6 packets through.
  
  ng_nat implements NAT for IPv4 traffic only.  When connected to an
  ng_ether node it erroneously handled IPv6 packets as well.
  
  This change is not sufficient: ng_nat does not do any validation of IP
  packets in this mode, even though they have not yet passed through
  ip_input().
  
  PR:   243096
  Reported by:  Robert James Hernandez 
  Reviewed by:  julian
  Differential Revision:https://reviews.freebsd.org/D23080

Modified:
  head/share/man/man4/ng_nat.4
  head/sys/netgraph/ng_nat.c

Modified: head/share/man/man4/ng_nat.4
==
--- head/share/man/man4/ng_nat.4Thu Jan 23 16:45:10 2020
(r357052)
+++ head/share/man/man4/ng_nat.4Thu Jan 23 16:45:48 2020
(r357053)
@@ -35,7 +35,7 @@
 .Sh DESCRIPTION
 An
 .Nm
-node performs network address translation (NAT) of packets
+node performs network address translation (NAT) of IPv4 packets
 passing through it.
 A
 .Nm nat

Modified: head/sys/netgraph/ng_nat.c
==
--- head/sys/netgraph/ng_nat.c  Thu Jan 23 16:45:10 2020(r357052)
+++ head/sys/netgraph/ng_nat.c  Thu Jan 23 16:45:48 2020(r357053)
@@ -795,7 +795,6 @@ ng_nat_rcvdata(hook_p hook, item_p item )
eh = mtod(m, struct ether_header *);
switch (ntohs(eh->ether_type)) {
case ETHERTYPE_IP:
-   case ETHERTYPE_IPV6:
ipofs = sizeof(struct ether_header);
break;
default:
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r357054 - head/sys/x86/x86

2020-01-23 Thread Konstantin Belousov

Author: kib
Date: Thu Jan 23 17:08:33 2020
New Revision: 357054
URL: https://svnweb.freebsd.org/changeset/base/357054

Log:
  Fix r356919.
  
  Instead of waiting for pc_curthread which is overwritten by
  init_secondary_tail(), wait for non-NULL pc_curpcb, to be set by the
  first context switch.
  Assert that pc_curpcb is not set too early.
  
  Reported and tested by:   rlibby
  Reviewed by:  markj, rlibby
  Sponsored by: The FreeBSD Foundation
  MFC after:1 week
  Differential revision:https://reviews.freebsd.org/D23330

Modified:
  head/sys/x86/x86/mp_x86.c

Modified: head/sys/x86/x86/mp_x86.c
==
--- head/sys/x86/x86/mp_x86.c   Thu Jan 23 16:45:48 2020(r357053)
+++ head/sys/x86/x86/mp_x86.c   Thu Jan 23 17:08:33 2020(r357054)
@@ -1084,6 +1084,11 @@ init_secondary_tail(void)
 
kcsan_cpu_init(cpuid);
 
+   /*
+* Assert that smp_after_idle_runnable condition is reasonable.
+*/
+   MPASS(PCPU_GET(curpcb) == NULL);
+
sched_throw(NULL);
 
panic("scheduler returned us to %s", __func__);
@@ -1098,7 +1103,7 @@ smp_after_idle_runnable(void *arg __unused)
 
for (cpu = 1; cpu < mp_ncpus; cpu++) {
pc = pcpu_find(cpu);
-   while (atomic_load_ptr(&pc->pc_curthread) == (uintptr_t)NULL)
+   while (atomic_load_ptr(&pc->pc_curpcb) == (uintptr_t)NULL)
cpu_spinwait();
kmem_free((vm_offset_t)bootstacks[cpu], kstack_pages *
PAGE_SIZE);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r357055 - head/sys/sparc64/sparc64

Author: markj
Date: Thu Jan 23 17:18:58 2020
New Revision: 357055
URL: https://svnweb.freebsd.org/changeset/base/357055

Log:
  sparc64: Busy the TSB page before freeing it in pmap_release().
  
  This is now required by vm_page_free().
  
  PR:   243534
  Reported and tested by:   Michael Reim 

Modified:
  head/sys/sparc64/sparc64/pmap.c

Modified: head/sys/sparc64/sparc64/pmap.c
==
--- head/sys/sparc64/sparc64/pmap.c Thu Jan 23 17:08:33 2020
(r357054)
+++ head/sys/sparc64/sparc64/pmap.c Thu Jan 23 17:18:58 2020
(r357055)
@@ -1302,6 +1302,7 @@ pmap_release(pmap_t pm)
m = TAILQ_FIRST(&obj->memq);
m->md.pmap = NULL;
vm_page_unwire_noq(m);
+   vm_page_xbusy(m);
vm_page_free_zero(m);
}
VM_OBJECT_WUNLOCK(obj);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r357056 - head/sys/sys

Author: emaste
Date: Thu Jan 23 17:38:17 2020
New Revision: 357056
URL: https://svnweb.freebsd.org/changeset/base/357056

Log:
  add MIPS-specific PT header ELF definitions
  
  Submitted by: David Carlier
  MFC after:1 week
  Differential Revision:https://reviews.freebsd.org/D19428

Modified:
  head/sys/sys/elf_common.h

Modified: head/sys/sys/elf_common.h
==
--- head/sys/sys/elf_common.h   Thu Jan 23 17:18:58 2020(r357055)
+++ head/sys/sys/elf_common.h   Thu Jan 23 17:38:17 2020(r357056)
@@ -543,6 +543,10 @@ typedef struct {
 #definePT_LOPROC   0x7000  /* First processor-specific 
type. */
 #definePT_ARM_ARCHEXT  0x7000  /* ARM arch compat information. 
*/
 #definePT_ARM_EXIDX0x7001  /* ARM exception unwind tables. 
*/
+#definePT_MIPS_REGINFO 0x7000  /* MIPS register usage 
info */
+#definePT_MIPS_RTPROC  0x7001  /* MIPS runtime 
procedure tbl */
+#definePT_MIPS_OPTIONS 0x7002  /* MIPS e_flags value*/
+#definePT_MIPS_ABIFLAGS0x7003  /* MIPS fp mode */
 #definePT_HIPROC   0x7fff  /* Last processor-specific 
type. */
 
 #definePT_OPENBSD_RANDOMIZE0x65A3DBE6  /* OpenBSD random data 
segment */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r357055 - head/sys/sparc64/sparc64

2020-01-23 Thread Jeff Roberson


On Thu, 23 Jan 2020, Mark Johnston wrote:


Author: markj
Date: Thu Jan 23 17:18:58 2020
New Revision: 357055
URL: https://svnweb.freebsd.org/changeset/base/357055

Log:
 sparc64: Busy the TSB page before freeing it in pmap_release().

 This is now required by vm_page_free().

 PR:243534
 Reported and tested by:Michael Reim 

Modified:
 head/sys/sparc64/sparc64/pmap.c

Modified: head/sys/sparc64/sparc64/pmap.c
==
--- head/sys/sparc64/sparc64/pmap.c Thu Jan 23 17:08:33 2020
(r357054)
+++ head/sys/sparc64/sparc64/pmap.c Thu Jan 23 17:18:58 2020
(r357055)
@@ -1302,6 +1302,7 @@ pmap_release(pmap_t pm)
m = TAILQ_FIRST(&obj->memq);
m->md.pmap = NULL;
vm_page_unwire_noq(m);
+   vm_page_xbusy(m);


vm_page_xbusy() is unsafe long-term and I will be removing it as soon as I 
get patches into drm.  It technically 'works' now but not for great 
reasons.


Thanks,
Jeff


vm_page_free_zero(m);
}
VM_OBJECT_WUNLOCK(obj);


___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r357055 - head/sys/sparc64/sparc64

On Thu, Jan 23, 2020 at 08:22:55AM -1000, Jeff Roberson wrote:
> On Thu, 23 Jan 2020, Mark Johnston wrote:
> 
> > Author: markj
> > Date: Thu Jan 23 17:18:58 2020
> > New Revision: 357055
> > URL: https://svnweb.freebsd.org/changeset/base/357055
> > 
> > Log:
> >  sparc64: Busy the TSB page before freeing it in pmap_release().
> > 
> >  This is now required by vm_page_free().
> > 
> >  PR:243534
> >  Reported and tested by:Michael Reim 
> > 
> > Modified:
> >  head/sys/sparc64/sparc64/pmap.c
> > 
> > Modified: head/sys/sparc64/sparc64/pmap.c
> > ==
> > --- head/sys/sparc64/sparc64/pmap.c Thu Jan 23 17:08:33 2020
> > (r357054)
> > +++ head/sys/sparc64/sparc64/pmap.c Thu Jan 23 17:18:58 2020
> > (r357055)
> > @@ -1302,6 +1302,7 @@ pmap_release(pmap_t pm)
> > m = TAILQ_FIRST(&obj->memq);
> > m->md.pmap = NULL;
> > vm_page_unwire_noq(m);
> > +   vm_page_xbusy(m);
> 
> vm_page_xbusy() is unsafe long-term and I will be removing it as soon as I
> get patches into drm.  It technically 'works' now but not for great reasons.

Yeah, this is just to satisfy the interface contract.  These pages are
unmanaged, so it really shouldn't make a difference.

> Thanks,
> Jeff
> 
> > vm_page_free_zero(m);
> > }
> > VM_OBJECT_WUNLOCK(obj);
> > 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r356990 - head/etc

2020-01-23 Thread Rodney W. Grimes

[ Charset UTF-8 unsupported, converting... ]
> On Wed, 22 Jan 2020 at 13:40, Ed Maste  wrote:
> >
> > Author: emaste
> > Date: Wed Jan 22 18:40:19 2020
> > New Revision: 356990
> > URL: https://svnweb.freebsd.org/changeset/base/356990
> >
> > Log:
> >   Tag NLS aliases with package=runtime
> 
> This commit message does not match the change, it should be
> 'package=utilities'. The symlink is tagged 'package=utilities'
> matching the NLS data in /usr/share/locale/...
> 

Revert and recommit?  Note that this email message well not
be found by anyone looking at svn logs trying to find stuff.

IMHO any commit message that does not match the actual commit
should be reverted and recommitted with the correct message.

-- 
Rod Grimes rgri...@freebsd.org
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r357051 - head/sys/dev/bge

2020-01-23 Thread Ryan Stone

What is a driver's responsibility now for entering/leaving the net epoch now?
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r357002 - in head: share/man/man4 sys/conf sys/kern sys/modules/cpufreq sys/sys sys/x86/cpufreq

(I had to look that up.)  Yeah, they're different.  Speedstep is
est(4), the ~15-year old predecessor to Speedshift.  They serve
similar purposes but purportedly (and plausibly) Speedshift does a
better job; also SpeedStep is maybe going away entirely in newer CPUs.

Current gens like Skylake and Kabylake have silicon for both, but if
intel_hwpstate(4) is enabled, est(4) doesn't work; hence the kludge in
est(4) to avoid "identifying" if intel_hwpstate(4) successfully
identified (wasn't disabled && new enough CPU).

Best,
Conrad

On Thu, Jan 23, 2020 at 12:55 AM Ravi Pokala  wrote:
>
> -Original Message-
> From:  on behalf of Conrad Meyer 
> 
> Date: 2020-01-22, Wednesday at 15:28
> To: , , 
> 
> Subject: svn commit: r357002 - in head: share/man/man4 sys/conf sys/kern 
> sys/modules/cpufreq sys/sys sys/x86/cpufreq
>
> Author: cem
> Date: Wed Jan 22 23:28:42 2020
> New Revision: 357002
> URL: https://svnweb.freebsd.org/changeset/base/357002
>
> Log:
>   cpufreq(4): Add support for Intel Speed Shift
>
>   Intel Speed Shift is Intel's technology to control frequency in 
> hardware,
>   with hints from software.
>
> Not to be confused with Intel Speed *Step*, right?
>
> (/me was confused; naming things is hard)
>
> -Ravi (rpokala@)
>
>   Let's get a working version of this in the tree and we can refine it 
> from
>   here.
>
>   Submitted by: bwidawsk, scottph
>   Reviewed by:  bcr (manpages), myself
>   Discussed with:   jhb, kib (earlier versions)
>   With feedback from:   Greg V, gallatin, freebsdnewbie AT freenet.de
>   Relnotes: yes
>   Differential Revision:https://reviews.freebsd.org/D18028
>
>
>
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r356990 - head/etc

2020-01-23 Thread Cy Schubert

In message <202001231914.00njehsm030...@gndrsh.dnsmgr.net>, "Rodney W. 
Grimes"
writes:
> [ Charset UTF-8 unsupported, converting... ]
> > On Wed, 22 Jan 2020 at 13:40, Ed Maste  wrote:
> > >
> > > Author: emaste
> > > Date: Wed Jan 22 18:40:19 2020
> > > New Revision: 356990
> > > URL: https://svnweb.freebsd.org/changeset/base/356990
> > >
> > > Log:
> > >   Tag NLS aliases with package=runtime
> > 
> > This commit message does not match the change, it should be
> > 'package=utilities'. The symlink is tagged 'package=utilities'
> > matching the NLS data in /usr/share/locale/...
> > 
>
> Revert and recommit?  Note that this email message well not
> be found by anyone looking at svn logs trying to find stuff.
>
> IMHO any commit message that does not match the actual commit
> should be reverted and recommitted with the correct message.

+1. It helps those who follow to inform them before deciding whether to dig 
into the code or not.


-- 
Cheers,
Cy Schubert 
FreeBSD UNIX: Web:  http://www.FreeBSD.org

The need of the many outweighs the greed of the few.


___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r357061 - head/sys/netpfil/pf

2020-01-23 Thread Kristof Provost

Author: kp
Date: Thu Jan 23 22:13:41 2020
New Revision: 357061
URL: https://svnweb.freebsd.org/changeset/base/357061

Log:
  pf: Apply kif flags to new group members
  
  If we have a 'set skip on ' rule this flag it set on the group
  kif, but must also be set on all members. pfctl does this when the rules
  are set, but if groups are added afterwards we must also apply the flags
  to the new member. If not, new group members will not be skipped until
  the rules are reloaded.
  
  Reported by:  dvl@
  Reviewed by:  glebius@
  Differential Revision:https://reviews.freebsd.org/D23254

Modified:
  head/sys/netpfil/pf/pf_if.c

Modified: head/sys/netpfil/pf/pf_if.c
==
--- head/sys/netpfil/pf/pf_if.c Thu Jan 23 21:46:33 2020(r357060)
+++ head/sys/netpfil/pf/pf_if.c Thu Jan 23 22:13:41 2020(r357061)
@@ -477,7 +477,9 @@ static void
 pfi_kif_update(struct pfi_kif *kif)
 {
struct ifg_list *ifgl;
+   struct ifg_member   *ifgm;
struct pfi_dynaddr  *p;
+   struct pfi_kif  *tmpkif;
 
NET_EPOCH_ASSERT();
PF_RULES_WASSERT();
@@ -485,6 +487,18 @@ pfi_kif_update(struct pfi_kif *kif)
/* update all dynaddr */
TAILQ_FOREACH(p, &kif->pfik_dynaddrs, entry)
pfi_dynaddr_update(p);
+
+   /* Apply group flags to new members. */
+   if (kif->pfik_group != NULL) {
+   CK_STAILQ_FOREACH(ifgm, &kif->pfik_group->ifg_members,
+   ifgm_next) {
+   tmpkif = (struct pfi_kif *)ifgm->ifgm_ifp->if_pf_kif;
+   if (tmpkif == NULL)
+   continue;
+
+   tmpkif->pfik_flags |= kif->pfik_flags;
+   }
+   }
 
/* again for all groups kif is member of */
if (kif->pfik_ifp != NULL) {
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r357051 - head/sys/dev/bge

On Thu, Jan 23, 2020 at 02:17:33PM -0500, Ryan Stone wrote:
R> What is a driver's responsibility now for entering/leaving the net epoch now?

For drivers that are 'special', entering the net epoch is necessary. Special
usually means running if_input outside network interrupt context.

However, there is plan to generalize entering/exiting epoch for taskqueues
and callouts.

-- 
Gleb Smirnoff
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r357051 - head/sys/dev/bge

2020-01-23 Thread Ian Lepore

On Thu, 2020-01-23 at 15:05 -0800, Gleb Smirnoff wrote:
> On Thu, Jan 23, 2020 at 02:17:33PM -0500, Ryan Stone wrote:
> R> What is a driver's responsibility now for entering/leaving the net epoch 
> now?
> 
> For drivers that are 'special', entering the net epoch is necessary. Special
> usually means running if_input outside network interrupt context.
> 
> However, there is plan to generalize entering/exiting epoch for taskqueues
> and callouts.
> 

That sounds every bit as horrible and out-of-place as the recent hack
(and it does feel very much like a horrible hack) that put network-
specific code into the guts of interrupt dispatching.

-- Ian


___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r357051 - head/sys/dev/bge

On Thu, Jan 23, 2020 at 04:08:32PM -0700, Ian Lepore wrote:
I> On Thu, 2020-01-23 at 15:05 -0800, Gleb Smirnoff wrote:
I> > On Thu, Jan 23, 2020 at 02:17:33PM -0500, Ryan Stone wrote:
I> > R> What is a driver's responsibility now for entering/leaving the net 
epoch now?
I> > 
I> > For drivers that are 'special', entering the net epoch is necessary. 
Special
I> > usually means running if_input outside network interrupt context.
I> > 
I> > However, there is plan to generalize entering/exiting epoch for taskqueues
I> > and callouts.
I> > 
I> 
I> That sounds every bit as horrible and out-of-place as the recent hack
I> (and it does feel very much like a horrible hack) that put network-
I> specific code into the guts of interrupt dispatching.

It isn't really a network code. You just include  which
declares the epoch KPI and a few globally recognized epochs. For now
the only one is the network epoch. 

If you want to have for a example a disk epoch also supported
by interrupt code, that would add one extra declaration to epoch.h,
and again nothing really disk related.

-- 
Gleb Smirnoff
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r357062 - head/share/man/man9

2020-01-23 Thread John Baldwin

Author: jhb
Date: Thu Jan 23 23:36:58 2020
New Revision: 357062
URL: https://svnweb.freebsd.org/changeset/base/357062

Log:
  Correct the return types of fueword*().
  
  MFC after:1 week
  Sponsored by: DARPA

Modified:
  head/share/man/man9/fetch.9

Modified: head/share/man/man9/fetch.9
==
--- head/share/man/man9/fetch.9 Thu Jan 23 22:13:41 2020(r357061)
+++ head/share/man/man9/fetch.9 Thu Jan 23 23:36:58 2020(r357062)
@@ -34,7 +34,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 17, 2018
+.Dd January 23, 2020
 .Dt FETCH 9
 .Os
 .Sh NAME
@@ -61,11 +61,11 @@
 .Fn fuword32 "volatile const void *base"
 .Ft int64_t
 .Fn fuword64 "volatile const void *base"
-.Ft long
+.Ft int
 .Fn fueword "volatile const void *base" "long *val"
-.Ft int32_t
+.Ft int
 .Fn fueword32 "volatile const void *base" "int32_t *val"
-.Ft int64_t
+.Ft int
 .Fn fueword64 "volatile const void *base" "int64_t *val"
 .In sys/resourcevar.h
 .Sh DESCRIPTION
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r357063 - head/sys/x86/cpufreq

Author: cem
Date: Thu Jan 23 23:52:57 2020
New Revision: 357063
URL: https://svnweb.freebsd.org/changeset/base/357063

Log:
  cpufreq(4): Fix missing MODULE_DEPEND on hwpstate_intel
  
  DRIVER_MODULE does not actually define a MODULE_VERSION, which is required
  to satisfy a MODULE_DEPENDency.  Declare one explicitly in
  hwpstate_intel(4).
  
  Reported by:  flo
  X-MFC-With:   r357002

Modified:
  head/sys/x86/cpufreq/hwpstate_intel.c

Modified: head/sys/x86/cpufreq/hwpstate_intel.c
==
--- head/sys/x86/cpufreq/hwpstate_intel.c   Thu Jan 23 23:36:58 2020
(r357062)
+++ head/sys/x86/cpufreq/hwpstate_intel.c   Thu Jan 23 23:52:57 2020
(r357063)
@@ -106,6 +106,7 @@ static driver_t hwpstate_intel_driver = {
 
 DRIVER_MODULE(hwpstate_intel, cpu, hwpstate_intel_driver,
 hwpstate_intel_devclass, NULL, NULL);
+MODULE_VERSION(hwpstate_intel, 1);
 
 static int
 intel_hwp_dump_sysctl_handler(SYSCTL_HANDLER_ARGS)
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r357051 - head/sys/dev/bge

2020-01-23 Thread Ryan Stone

On Thu, Jan 23, 2020 at 6:05 PM Gleb Smirnoff  wrote:
>
> On Thu, Jan 23, 2020 at 02:17:33PM -0500, Ryan Stone wrote:
> R> What is a driver's responsibility now for entering/leaving the net epoch 
> now?
>
> For drivers that are 'special', entering the net epoch is necessary. Special
> usually means running if_input outside network interrupt context.
>
> However, there is plan to generalize entering/exiting epoch for taskqueues
> and callouts.

Why on earth is it done that way rather than putting the network epoch
enter/exit in ether_input?  I'm with Ian; this sounds like a huge
layering violation.
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r357051 - head/sys/dev/bge

On Thu, Jan 23, 2020 at 08:17:46PM -0500, Ryan Stone wrote:
R> On Thu, Jan 23, 2020 at 6:05 PM Gleb Smirnoff  wrote:
R> >
R> > On Thu, Jan 23, 2020 at 02:17:33PM -0500, Ryan Stone wrote:
R> > R> What is a driver's responsibility now for entering/leaving the net 
epoch now?
R> >
R> > For drivers that are 'special', entering the net epoch is necessary. 
Special
R> > usually means running if_input outside network interrupt context.
R> >
R> > However, there is plan to generalize entering/exiting epoch for taskqueues
R> > and callouts.
R> 
R> Why on earth is it done that way rather than putting the network epoch
R> enter/exit in ether_input?  I'm with Ian; this sounds like a huge
R> layering violation.

Because at interrupt level we can batch multiple packets in a single epoch.
This speeds up unfiltered packet forwarding performance by 5%.

With driver level pfil hooks I would claim even more improvement, because before
the change we needed to enter epoch twice - once for filtering, than for 
ether_input.

Epoch isn't a layer, it is a synchronisation primitive, so I disagree about
statement on layering violation.

-- 
Gleb Smirnoff
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r357051 - head/sys/dev/bge

On Thu, Jan 23, 2020 at 08:17:46PM -0500, Ryan Stone wrote:
R> On Thu, Jan 23, 2020 at 6:05 PM Gleb Smirnoff  wrote:
R> >
R> > On Thu, Jan 23, 2020 at 02:17:33PM -0500, Ryan Stone wrote:
R> > R> What is a driver's responsibility now for entering/leaving the net 
epoch now?
R> >
R> > For drivers that are 'special', entering the net epoch is necessary. 
Special
R> > usually means running if_input outside network interrupt context.
R> >
R> > However, there is plan to generalize entering/exiting epoch for taskqueues
R> > and callouts.
R> 
R> Why on earth is it done that way rather than putting the network epoch
R> enter/exit in ether_input?  I'm with Ian; this sounds like a huge
R> layering violation.

Another thing I should have mentioned. Doing this at interrupt level
makes much easier to maintain alternative network stacks, for example
TOE - which now has tons of hacks. Same stands for netgraph. If you
hook ng_ether on, than ether_input is skipped and packet goes to
netgraph, then it can be injected back into network stack from a
different type of node.

-- 
Gleb Smirnoff
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r357065 - head/lib/libc/stdlib

Author: cem
Date: Fri Jan 24 01:32:16 2020
New Revision: 357065
URL: https://svnweb.freebsd.org/changeset/base/357065

Log:
  random(3): Abstract state into a single context object
  
  No functional change.
  
  Reviewed by:  kevans, markm
  Differential Revision:https://reviews.freebsd.org/D23288

Modified:
  head/lib/libc/stdlib/random.c

Modified: head/lib/libc/stdlib/random.c
==
--- head/lib/libc/stdlib/random.c   Fri Jan 24 01:00:28 2020
(r357064)
+++ head/lib/libc/stdlib/random.c   Fri Jan 24 01:32:16 2020
(r357065)
@@ -144,6 +144,19 @@ __FBSDID("$FreeBSD$");
 static const int degrees[MAX_TYPES] =  { DEG_0, DEG_1, DEG_2, DEG_3, DEG_4 };
 static const int seps [MAX_TYPES] ={ SEP_0, SEP_1, SEP_2, SEP_3, SEP_4 };
 
+/* A full instance of the random(3) generator. */
+struct random_state {
+   uint32_t*rst_fptr;
+   uint32_t*rst_rptr;
+   uint32_t*rst_state;
+   int rst_type;
+   int rst_deg;
+   int rst_sep;
+   uint32_t*rst_end_ptr;
+   /* Flexible array member must be last. */
+   uint32_trst_randtbl[];
+};
+
 /*
  * Initially, everything is set up as if from:
  *
@@ -157,52 +170,58 @@ static const int seps [MAX_TYPES] =   { SEP_0, SEP_1, 
SE
  *
  * MAX_TYPES * (rptr - state) + TYPE_3 == TYPE_3.
  */
+static struct random_state implicit = {
+   .rst_randtbl = {
+   TYPE_3,
+   0x2cf41758, 0x27bb3711, 0x4916d4d1, 0x7b02f59f, 0x9b8e28eb, 
0xc0e80269,
+   0x696f5c16, 0x878f1ff5, 0x52d9c07f, 0x916a06cd, 0xb50b3a20, 
0x2776970a,
+   0xee4eb2a6, 0xe94640ec, 0xb1d65612, 0x9d1ed968, 0x1043f6b7, 
0xa3432a76,
+   0x17eacbb9, 0x3c09e2eb, 0x4f8c2b3,  0x708a1f57, 0xee341814, 
0x95d0e4d2,
+   0xb06f216c, 0x8bd2e72e, 0x8f7c38d7, 0xcfc6a8fc, 0x2a59495,  
0xa20d2a69,
+   0xe29d12d1
+   },
 
-static uint32_t randtbl[DEG_3 + 1] = {
-   TYPE_3,
-   0x2cf41758, 0x27bb3711, 0x4916d4d1, 0x7b02f59f, 0x9b8e28eb, 0xc0e80269,
-   0x696f5c16, 0x878f1ff5, 0x52d9c07f, 0x916a06cd, 0xb50b3a20, 0x2776970a,
-   0xee4eb2a6, 0xe94640ec, 0xb1d65612, 0x9d1ed968, 0x1043f6b7, 0xa3432a76,
-   0x17eacbb9, 0x3c09e2eb, 0x4f8c2b3,  0x708a1f57, 0xee341814, 0x95d0e4d2,
-   0xb06f216c, 0x8bd2e72e, 0x8f7c38d7, 0xcfc6a8fc, 0x2a59495,  0xa20d2a69,
-   0xe29d12d1
+   /*
+* fptr and rptr are two pointers into the state info, a front and a 
rear
+* pointer.  These two pointers are always rand_sep places aparts, as 
they
+* cycle cyclically through the state information.  (Yes, this does 
mean we
+* could get away with just one pointer, but the code for random() is 
more
+* efficient this way).  The pointers are left positioned as they would 
be
+* from the call
+*
+*  initstate(1, randtbl, 128);
+*
+* (The position of the rear pointer, rptr, is really 0 (as explained 
above
+* in the initialization of randtbl) because the state table pointer is 
set
+* to point to randtbl[1] (as explained below).
+*/
+   .rst_fptr = &implicit.rst_randtbl[SEP_3 + 1],
+   .rst_rptr = &implicit.rst_randtbl[1],
+
+   /*
+* The following things are the pointer to the state information table, 
the
+* type of the current generator, the degree of the current polynomial 
being
+* used, and the separation between the two pointers.  Note that for 
efficiency
+* of random(), we remember the first location of the state 
information, not
+* the zeroeth.  Hence it is valid to access state[-1], which is used to
+* store the type of the R.N.G.  Also, we remember the last location, 
since
+* this is more efficient than indexing every time to find the address 
of
+* the last element to see if the front and rear pointers have wrapped.
+*/
+   .rst_state = &implicit.rst_randtbl[1],
+   .rst_type = TYPE_3,
+   .rst_deg = DEG_3,
+   .rst_sep = SEP_3,
+   .rst_end_ptr = &implicit.rst_randtbl[DEG_3 + 1],
 };
 
 /*
- * fptr and rptr are two pointers into the state info, a front and a rear
- * pointer.  These two pointers are always rand_sep places aparts, as they
- * cycle cyclically through the state information.  (Yes, this does mean we
- * could get away with just one pointer, but the code for random() is more
- * efficient this way).  The pointers are left positioned as they would be
- * from the call
- *
- * initstate(1, randtbl, 128);
- *
- * (The position of the rear pointer, rptr, is really 0 (as explained above
- * in the initialization of randtbl) because the state table pointer is set
- * to point to randtbl[1] (as explained below).
+ * This is the same low quality PRNG used in rand(3) in FreeBSD 12 and prior.
+ * It may be

Re: svn commit: r357051 - head/sys/dev/bge

2020-01-23 Thread Ryan Stone

On Thu, Jan 23, 2020 at 8:25 PM Gleb Smirnoff  wrote:
> Because at interrupt level we can batch multiple packets in a single epoch.
> This speeds up unfiltered packet forwarding performance by 5%.
>
> With driver level pfil hooks I would claim even more improvement, because 
> before
> the change we needed to enter epoch twice - once for filtering, than for 
> ether_input.
>
> Epoch isn't a layer, it is a synchronisation primitive, so I disagree about
> statement on layering violation.

Epoch is a synchronization primitive, but the net_epoch is absolutely
a part of the networking layer.  If we need better batching then the
correct solution is to introduce a batched interface for drivers to
push packets up the stack, not to mess around at the interrupt layer.

Note that the only reason why this works for mlx4/mlx5 is that
linuxkpi *always* requests a INTR_TYPE_NET no matter what driver is
running.  This means that all drm graphics driver interrupts are now
running under the net_epoch:

https://svnweb.freebsd.org/base/head/sys/compat/linuxkpi/common/include/linux/interrupt.h?revision=352205&view=markup#l103
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r357066 - head/lib/libc/stdlib

Author: cem
Date: Fri Jan 24 01:39:29 2020
New Revision: 357066
URL: https://svnweb.freebsd.org/changeset/base/357066

Log:
  random(3): Abstract routines into _r versions on explicit state
  
  The existing APIs simply pass the implicit global state to the _r variants.
  
  No functional change.
  
  Note that these routines are not exported from libc and are not intended to be
  exported.  If someone wished to export them from libc (which I would
  discourage), they should first be modified to match the inconsistent parameter
  type / order of the glibc public interfaces of the same names.
  
  I know Ravi will ask, so: the eventual goal of this series is to replace
  rand(3) with the implementation from random(3) (D23290).  However, I'd like to
  wait a bit longer on that one to see if more feedback emerges.
  
  Reviewed by:  kevans, markm
  Differential Revision:https://reviews.freebsd.org/D23289

Added:
  head/lib/libc/stdlib/random.h   (contents, props changed)
Modified:
  head/lib/libc/stdlib/random.c

Modified: head/lib/libc/stdlib/random.c
==
--- head/lib/libc/stdlib/random.c   Fri Jan 24 01:32:16 2020
(r357065)
+++ head/lib/libc/stdlib/random.c   Fri Jan 24 01:39:29 2020
(r357066)
@@ -38,10 +38,13 @@ __FBSDID("$FreeBSD$");
 #include "namespace.h"
 #include 
 #include 
+#include 
 #include 
 #include 
 #include "un-namespace.h"
 
+#include "random.h"
+
 /*
  * random.c:
  *
@@ -144,19 +147,6 @@ __FBSDID("$FreeBSD$");
 static const int degrees[MAX_TYPES] =  { DEG_0, DEG_1, DEG_2, DEG_3, DEG_4 };
 static const int seps [MAX_TYPES] ={ SEP_0, SEP_1, SEP_2, SEP_3, SEP_4 };
 
-/* A full instance of the random(3) generator. */
-struct random_state {
-   uint32_t*rst_fptr;
-   uint32_t*rst_rptr;
-   uint32_t*rst_state;
-   int rst_type;
-   int rst_deg;
-   int rst_sep;
-   uint32_t*rst_end_ptr;
-   /* Flexible array member must be last. */
-   uint32_trst_randtbl[];
-};
-
 /*
  * Initially, everything is set up as if from:
  *
@@ -170,7 +160,7 @@ struct random_state {
  *
  * MAX_TYPES * (rptr - state) + TYPE_3 == TYPE_3.
  */
-static struct random_state implicit = {
+static struct __random_state implicit = {
.rst_randtbl = {
TYPE_3,
0x2cf41758, 0x27bb3711, 0x4916d4d1, 0x7b02f59f, 0x9b8e28eb, 
0xc0e80269,
@@ -257,25 +247,31 @@ parkmiller32(uint32_t ctx)
  * for default usage relies on values produced by this routine.
  */
 void
-srandom(unsigned int x)
+srandom_r(struct __random_state *estate, unsigned x)
 {
int i, lim;
 
-   implicit.rst_state[0] = (uint32_t)x;
-   if (implicit.rst_type == TYPE_0)
+   estate->rst_state[0] = (uint32_t)x;
+   if (estate->rst_type == TYPE_0)
lim = NSHUFF;
else {
-   for (i = 1; i < implicit.rst_deg; i++)
-   implicit.rst_state[i] =
-   parkmiller32(implicit.rst_state[i - 1]);
-   implicit.rst_fptr = &implicit.rst_state[implicit.rst_sep];
-   implicit.rst_rptr = &implicit.rst_state[0];
-   lim = 10 * implicit.rst_deg;
+   for (i = 1; i < estate->rst_deg; i++)
+   estate->rst_state[i] =
+   parkmiller32(estate->rst_state[i - 1]);
+   estate->rst_fptr = &estate->rst_state[estate->rst_sep];
+   estate->rst_rptr = &estate->rst_state[0];
+   lim = 10 * estate->rst_deg;
}
for (i = 0; i < lim; i++)
-   (void)random();
+   (void)random_r(estate);
 }
 
+void
+srandom(unsigned x)
+{
+   srandom_r(&implicit, x);
+}
+
 /*
  * srandomdev:
  *
@@ -289,20 +285,20 @@ srandom(unsigned int x)
  * derived from the LC algorithm applied to a fixed seed.
  */
 void
-srandomdev(void)
+srandomdev_r(struct __random_state *estate)
 {
int mib[2];
size_t expected, len;
 
-   if (implicit.rst_type == TYPE_0)
-   len = sizeof(implicit.rst_state[0]);
+   if (estate->rst_type == TYPE_0)
+   len = sizeof(estate->rst_state[0]);
else
-   len = implicit.rst_deg * sizeof(implicit.rst_state[0]);
+   len = estate->rst_deg * sizeof(estate->rst_state[0]);
expected = len;
 
mib[0] = CTL_KERN;
mib[1] = KERN_ARND;
-   if (sysctl(mib, 2, implicit.rst_state, &len, NULL, 0) == -1 ||
+   if (sysctl(mib, 2, estate->rst_state, &len, NULL, 0) == -1 ||
len != expected) {
/*
 * The sysctl cannot fail. If it does fail on some FreeBSD
@@ -313,14 +309,20 @@ srandomdev(void)
abort();
}
 
-   if (implicit.rst_type != TYPE_0) {
-   implicit.rst_fptr = &implicit.rst_state[implicit.rst_sep];
-

svn commit: r357067 - in head: lib/libbe lib/libbe/tests sbin/bectl

2020-01-23 Thread Kyle Evans

Author: kevans
Date: Fri Jan 24 02:18:09 2020
New Revision: 357067
URL: https://svnweb.freebsd.org/changeset/base/357067

Log:
  Drop "All Rights Reserved" from all libbe/bectl files
  
  I sent out an e-mail on 2020/01/21 with a plan to do this to Kyle, Rob, and
  Wes; all parties have responded in the affirmative that it's OK to drop it
  from these files.

Modified:
  head/lib/libbe/be.c
  head/lib/libbe/be.h
  head/lib/libbe/be_access.c
  head/lib/libbe/be_error.c
  head/lib/libbe/be_impl.h
  head/lib/libbe/be_info.c
  head/lib/libbe/libbe.3
  head/lib/libbe/tests/target_prog.c
  head/sbin/bectl/bectl.8
  head/sbin/bectl/bectl.c

Modified: head/lib/libbe/be.c
==
--- head/lib/libbe/be.c Fri Jan 24 01:39:29 2020(r357066)
+++ head/lib/libbe/be.c Fri Jan 24 02:18:09 2020(r357067)
@@ -2,7 +2,6 @@
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
  * Copyright (c) 2017 Kyle J. Kneitinger 
- * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: head/lib/libbe/be.h
==
--- head/lib/libbe/be.h Fri Jan 24 01:39:29 2020(r357066)
+++ head/lib/libbe/be.h Fri Jan 24 02:18:09 2020(r357067)
@@ -2,7 +2,6 @@
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
  * Copyright (c) 2017 Kyle J. Kneitinger 
- * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: head/lib/libbe/be_access.c
==
--- head/lib/libbe/be_access.c  Fri Jan 24 01:39:29 2020(r357066)
+++ head/lib/libbe/be_access.c  Fri Jan 24 02:18:09 2020(r357067)
@@ -4,7 +4,6 @@
  * Copyright (c) 2017 Kyle J. Kneitinger 
  * Copyright (c) 2018 Kyle Evans 
  * Copyright (c) 2019 Wes Maag 
- * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: head/lib/libbe/be_error.c
==
--- head/lib/libbe/be_error.c   Fri Jan 24 01:39:29 2020(r357066)
+++ head/lib/libbe/be_error.c   Fri Jan 24 02:18:09 2020(r357067)
@@ -2,7 +2,6 @@
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
  * Copyright (c) 2017 Kyle J. Kneitinger 
- * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: head/lib/libbe/be_impl.h
==
--- head/lib/libbe/be_impl.hFri Jan 24 01:39:29 2020(r357066)
+++ head/lib/libbe/be_impl.hFri Jan 24 02:18:09 2020(r357067)
@@ -2,7 +2,6 @@
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
  * Copyright (c) 2017 Kyle J. Kneitinger 
- * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: head/lib/libbe/be_info.c
==
--- head/lib/libbe/be_info.cFri Jan 24 01:39:29 2020(r357066)
+++ head/lib/libbe/be_info.cFri Jan 24 02:18:09 2020(r357067)
@@ -3,7 +3,6 @@
  *
  * Copyright (c) 2017 Kyle J. Kneitinger 
  * Copyright (c) 2018 Kyle Evans 
- * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: head/lib/libbe/libbe.3
==
--- head/lib/libbe/libbe.3  Fri Jan 24 01:39:29 2020(r357066)
+++ head/lib/libbe/libbe.3  Fri Jan 24 02:18:09 2020(r357067)
@@ -2,7 +2,6 @@
 .\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
 .\"
 .\" Copyright (c) 2017 Kyle Kneitinger
-.\" All rights reserved.
 .\" Copyright (c) 2018 Kyle Evans 
 .\"
 .\" Redistribution and use in source and binary forms, with or without

Modified: head/lib/libbe/tests/target_prog.c
==
--- head/lib/libbe/tests/target_prog.c  Fri Jan 24 01:39:29 2020
(r357066)
+++ head/lib/libbe/tests/target_prog.c  Fri Jan 24 02:18:09 2020
(r357067)
@@ -2,7 +2,6 @@
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
  * Copyright (c) 2019 Rob Wing
- * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: head/sbin/bectl/bectl.8
=

Re: svn commit: r357051 - head/sys/dev/bge

On Thu, Jan 23, 2020 at 08:33:58PM -0500, Ryan Stone wrote:
R> > Because at interrupt level we can batch multiple packets in a single epoch.
R> > This speeds up unfiltered packet forwarding performance by 5%.
R> >
R> > With driver level pfil hooks I would claim even more improvement, because 
before
R> > the change we needed to enter epoch twice - once for filtering, than for 
ether_input.
R> >
R> > Epoch isn't a layer, it is a synchronisation primitive, so I disagree about
R> > statement on layering violation.
R> 
R> Epoch is a synchronization primitive, but the net_epoch is absolutely
R> a part of the networking layer.  If we need better batching then the
R> correct solution is to introduce a batched interface for drivers to
R> push packets up the stack, not to mess around at the interrupt layer.

Such interface of course would be valuable but will not cover case
when an interrupt arrives during processing of previous one. So its
batching possiblities are limited compared to interrupt level batching.

And I already noted that ether_input() isn't the only way to enter
the network stack.

R> Note that the only reason why this works for mlx4/mlx5 is that
R> linuxkpi *always* requests a INTR_TYPE_NET no matter what driver is
R> running.  This means that all drm graphics driver interrupts are now
R> running under the net_epoch:
R> 
R> 
https://svnweb.freebsd.org/base/head/sys/compat/linuxkpi/common/include/linux/interrupt.h?revision=352205&view=markup#l103

Well, it is not my fault that a video driver requests INTR_TYPE_NET
interrupt. I mean, you can't put this as a rationale against using
network epoch for all interrrupts that declare theirselves as network
interrupts. However, this is harmless.

-- 
Gleb Smirnoff
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r357051 - head/sys/dev/bge

2020-01-23 Thread Jeff Roberson

On Thu, 23 Jan 2020, Gleb Smirnoff wrote:

On Thu, Jan 23, 2020 at 08:33:58PM -0500, Ryan Stone wrote:
R> > Because at interrupt level we can batch multiple packets in a single epoch.
R> > This speeds up unfiltered packet forwarding performance by 5%.
R> >
R> > With driver level pfil hooks I would claim even more improvement, because
before
R> > the change we needed to enter epoch twice - once for filtering, than for
ether_input.
R> >
R> > Epoch isn't a layer, it is a synchronisation primitive, so I disagree about
R> > statement on layering violation.
R>
R> Epoch is a synchronization primitive, but the net_epoch is absolutely
R> a part of the networking layer. If we need better batching then the
R> correct solution is to introduce a batched interface for drivers to
R> push packets up the stack, not to mess around at the interrupt layer.

Such interface of course would be valuable but will not cover case
when an interrupt arrives during processing of previous one. So its
batching possiblities are limited compared to interrupt level batching.

And I already noted that ether_input() isn't the only way to enter
the network stack.

R> Note that the only reason why this works for mlx4/mlx5 is that
R> linuxkpi *always* requests a INTR_TYPE_NET no matter what driver is
R> running. This means that all drm graphics driver interrupts are now
R> running under the net_epoch:
R>
R>
https://svnweb.freebsd.org/base/head/sys/compat/linuxkpi/common/include/linux/interrupt.h?revision=352205&view=markup#l103

The historical reason is that linuxkpi was originally made to support ofed
and there was no real way to get this information from the driver.

Well, it is not my fault that a video driver requests INTR_TYPE_NET
interrupt. I mean, you can't put this as a rationale against using
network epoch for all interrrupts that declare theirselves as network
interrupts. However, this is harmless.

While we don't have a policy strictly requiring reviews it is the norm to
have substantial changes socialized and reviewed. I appreciate the work
that you are doing but it likely should've been discussed somewhere
more publicly. I apologized if I missed it but I don't see reference to
anything.

Architecturally I am more concerned with the coarseness of net_epoch and
the duration of hold becoming a resource utilization problem in high
turn-over workloads. Like short connection tcp. Has anyone done
substantial testing here? epoch as it is today will hold every free
callback for a minimum of several clock ticks and a maximum of 2x the
duration of the longest epoch section time. With preemption, etc. this
could be 100s of ms of PCBs held.

Thanks,
Jeff

--
Gleb Smirnoff

___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r357051 - head/sys/dev/bge

On Thu, Jan 23, 2020 at 05:09:14PM -1000, Jeff Roberson wrote:
J> While we don't have a policy strictly requiring reviews it is the norm to 
J> have substantial changes socialized and reviewed.  I appreciate the work 
J> that you are doing but it likely should've been discussed somewhere 
J> more publicly.  I apologized if I missed it but I don't see reference to 
J> anything.

That was https://reviews.freebsd.org/D23242

J> Architecturally I am more concerned with the coarseness of net_epoch and 
J> the duration of hold becoming a resource utilization problem in high 
J> turn-over workloads.  Like short connection tcp.  Has anyone done 
J> substantial testing here?  epoch as it is today will hold every free 
J> callback for a minimum of several clock ticks and a maximum of 2x the 
J> duration of the longest epoch section time.  With preemption, etc. this 
J> could be 100s of ms of PCBs held.

We also are concerned about that theoretically. Haven't yet seen effect
in practice, but our sessions are mostly longer living. First we have the
tunable to limit batching. Second, there are some ideas on how to improve
the garbage collector performance if it becomes an issue.

-- 
Gleb Smirnoff
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r357051 - head/sys/dev/bge

2020-01-23 Thread Jeff Roberson


On Thu, 23 Jan 2020, Gleb Smirnoff wrote:


On Thu, Jan 23, 2020 at 05:09:14PM -1000, Jeff Roberson wrote:
J> While we don't have a policy strictly requiring reviews it is the norm to
J> have substantial changes socialized and reviewed.  I appreciate the work
J> that you are doing but it likely should've been discussed somewhere
J> more publicly.  I apologized if I missed it but I don't see reference to
J> anything.

That was https://reviews.freebsd.org/D23242


Ok thank you.  Can you tag commits so people can see the discussion?  Was 
it in one I missed?  When I'm committing a long patch series I include the 
link in all of them.


Ryan, are you subscribed to @networking?



J> Architecturally I am more concerned with the coarseness of net_epoch and
J> the duration of hold becoming a resource utilization problem in high
J> turn-over workloads.  Like short connection tcp.  Has anyone done
J> substantial testing here?  epoch as it is today will hold every free
J> callback for a minimum of several clock ticks and a maximum of 2x the
J> duration of the longest epoch section time.  With preemption, etc. this
J> could be 100s of ms of PCBs held.

We also are concerned about that theoretically. Haven't yet seen effect
in practice, but our sessions are mostly longer living. First we have the
tunable to limit batching. Second, there are some ideas on how to improve
the garbage collector performance if it becomes an issue.


I am often surprised at how much cpu time I see on linux spent in RCU free 
processing.  Many of these things are written in such a way that 
everything is cache cold by the time you swing back around.  So the 
callout walk is a giant cold linked list.


Thanks,
Jeff



--
Gleb Smirnoff


___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r357051 - head/sys/dev/bge

On Thu, Jan 23, 2020 at 06:18:15PM -1000, Jeff Roberson wrote:
J> > That was https://reviews.freebsd.org/D23242
J> 
J> Ok thank you.  Can you tag commits so people can see the discussion?  Was 
J> it in one I missed?  When I'm committing a long patch series I include the 
J> link in all of them.

I probably now on will also include in every patch in a serie. I just
dislike that first one (usually a preparation change) closes the review.

-- 
Gleb Smirnoff
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r357028 - head/sys/vm

2020-01-23 Thread Alexey Dokuchaev

On Wed, Jan 22, 2020 at 07:33:00PM -1000, Jeff Roberson wrote:
> You may be asking yourself, why did jeff just squish a bunch of code
> around with little functional change.  I could not justify adding more
> complexity to a 900 line function with a handful of gotos.  It is ~300
> lines now.  I tested the whole set together.  I apologize if there are
> bugs.

I'm quite certain folks do appreciate the good work Jeff.  "Reviewed by:
dougm, kib, markj" lines leave very little room for doubt. :-)

./danfe
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r357068 - head/usr.sbin/ntp/libntpevent

2020-01-23 Thread Adrian Chadd

Author: adrian
Date: Fri Jan 24 06:24:40 2020
New Revision: 357068
URL: https://svnweb.freebsd.org/changeset/base/357068

Log:
  [ntp] Don't compile in the ssl routines into libevent if MK_OPENSSL is no
  
  Most of ntpd still handles MK_OPENSSL ok, but the libevent import brought
  in the SSL bufferevent routines without checking MK_OPENSSL.
  
  This doesn't completely fix WITHOUT_CRYPTO=YES building, but hey, it's one
  less broken thing.

Modified:
  head/usr.sbin/ntp/libntpevent/Makefile

Modified: head/usr.sbin/ntp/libntpevent/Makefile
==
--- head/usr.sbin/ntp/libntpevent/Makefile  Fri Jan 24 02:18:09 2020
(r357067)
+++ head/usr.sbin/ntp/libntpevent/Makefile  Fri Jan 24 06:24:40 2020
(r357068)
@@ -1,15 +1,21 @@
 # $FreeBSD$
 
+.include 
+
 .PATH: ${SRCTOP}/contrib/libevent
 
 LIB= ntpevent
 INTERNALLIB=
 
-SRCS=  buffer.c bufferevent.c bufferevent_filter.c bufferevent_openssl.c \
+SRCS=  buffer.c bufferevent.c bufferevent_filter.c \
bufferevent_pair.c epoll.c evdns.c event.c event_tagging.c \
evmap.c evport.c evrpc.c evthread.c evthread_pthread.c evutil.c \
evutil_rand.c evutil_time.c http.c kqueue.c listener.c log.c poll.c \
select.c signal.c strlcpy.c
+
+.if ${MK_OPENSSL} != "no"
+SRCS+= bufferevent_openssl.c
+.endif
 
 .if ${MACHINE_ARCH} == "i386"
 NTP_ATOMIC=x86_32
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r357069 - head/sys/kern

Author: mjg
Date: Fri Jan 24 07:42:57 2020
New Revision: 357069
URL: https://svnweb.freebsd.org/changeset/base/357069

Log:
  lockmgr: don't touch the lock past unlock
  
  This evens it up with other locking primitives.
  
  Note lock profiling still touches the lock, which again is in line with the
  rest.
  
  Reviewed by:  jeff
  Differential Revision:https://reviews.freebsd.org/D23343

Modified:
  head/sys/kern/kern_lock.c

Modified: head/sys/kern/kern_lock.c
==
--- head/sys/kern/kern_lock.c   Fri Jan 24 06:24:40 2020(r357068)
+++ head/sys/kern/kern_lock.c   Fri Jan 24 07:42:57 2020(r357069)
@@ -209,7 +209,6 @@ static void
 lockmgr_note_shared_release(struct lock *lk, const char *file, int line)
 {
 
-   LOCKSTAT_PROFILE_RELEASE_RWLOCK(lockmgr__release, lk, LOCKSTAT_READER);
WITNESS_UNLOCK(&lk->lock_object, 0, file, line);
LOCK_LOG_LOCK("SUNLOCK", &lk->lock_object, 0, 0, file, line);
TD_LOCKS_DEC(curthread);
@@ -234,11 +233,12 @@ static void
 lockmgr_note_exclusive_release(struct lock *lk, const char *file, int line)
 {
 
-   LOCKSTAT_PROFILE_RELEASE_RWLOCK(lockmgr__release, lk, LOCKSTAT_WRITER);
+   if (LK_HOLDER(lk->lk_lock) != LK_KERNPROC) {
+   WITNESS_UNLOCK(&lk->lock_object, LOP_EXCLUSIVE, file, line);
+   TD_LOCKS_DEC(curthread);
+   }
LOCK_LOG_LOCK("XUNLOCK", &lk->lock_object, 0, lk->lk_recurse, file,
line);
-   WITNESS_UNLOCK(&lk->lock_object, LOP_EXCLUSIVE, file, line);
-   TD_LOCKS_DEC(curthread);
 }
 
 static __inline struct thread *
@@ -388,7 +388,7 @@ retry_sleepq:
break;
}
 
-   lockmgr_note_shared_release(lk, file, line);
+   LOCKSTAT_PROFILE_RELEASE_RWLOCK(lockmgr__release, lk, LOCKSTAT_READER);
return (wakeup_swapper);
 }
 
@@ -924,6 +924,7 @@ lockmgr_upgrade(struct lock *lk, u_int flags, struct l
 * We have been unable to succeed in upgrading, so just
 * give up the shared lock.
 */
+   lockmgr_note_shared_release(lk, file, line);
wakeup_swapper |= wakeupshlk(lk, file, line);
error = lockmgr_xlock_hard(lk, flags, ilk, file, line, lwa);
flags &= ~LK_INTERLOCK;
@@ -1034,11 +1035,6 @@ lockmgr_xunlock_hard(struct lock *lk, uintptr_t x, u_i
 */
if (LK_HOLDER(x) == LK_KERNPROC)
tid = LK_KERNPROC;
-   else {
-   WITNESS_UNLOCK(&lk->lock_object, LOP_EXCLUSIVE, file, line);
-   TD_LOCKS_DEC(curthread);
-   }
-   LOCK_LOG_LOCK("XUNLOCK", &lk->lock_object, 0, lk->lk_recurse, file, 
line);
 
/*
 * The lock is held in exclusive mode.
@@ -1135,16 +1131,18 @@ lockmgr_unlock_fast_path(struct lock *lk, u_int flags,
_lockmgr_assert(lk, KA_LOCKED, file, line);
x = lk->lk_lock;
if (__predict_true(x & LK_SHARE) != 0) {
+   lockmgr_note_shared_release(lk, file, line);
if (lockmgr_sunlock_try(lk, &x)) {
-   lockmgr_note_shared_release(lk, file, line);
+   LOCKSTAT_PROFILE_RELEASE_RWLOCK(lockmgr__release, lk, 
LOCKSTAT_READER);
} else {
return (lockmgr_sunlock_hard(lk, x, flags, ilk, file, 
line));
}
} else {
tid = (uintptr_t)curthread;
+   lockmgr_note_exclusive_release(lk, file, line);
if (!lockmgr_recursed(lk) &&
atomic_cmpset_rel_ptr(&lk->lk_lock, tid, LK_UNLOCKED)) {
-   lockmgr_note_exclusive_release(lk, file, line);
+   LOCKSTAT_PROFILE_RELEASE_RWLOCK(lockmgr__release, lk, 
LOCKSTAT_WRITER);
} else {
return (lockmgr_xunlock_hard(lk, x, flags, ilk, file, 
line));
}
@@ -1221,16 +1219,18 @@ lockmgr_unlock(struct lock *lk)
_lockmgr_assert(lk, KA_LOCKED, file, line);
x = lk->lk_lock;
if (__predict_true(x & LK_SHARE) != 0) {
+   lockmgr_note_shared_release(lk, file, line);
if (lockmgr_sunlock_try(lk, &x)) {
-   lockmgr_note_shared_release(lk, file, line);
+   LOCKSTAT_PROFILE_RELEASE_RWLOCK(lockmgr__release, lk, 
LOCKSTAT_READER);
} else {
return (lockmgr_sunlock_hard(lk, x, LK_RELEASE, NULL, 
file, line));
}
} else {
tid = (uintptr_t)curthread;
+   lockmgr_note_exclusive_release(lk, file, line);
if (!lockmgr_recursed(lk) &&
atomic_cmpset_rel_ptr(&lk->lk_lock, tid, LK_UNLOCKED)) {
-   lockmgr_note_exclusive_release(lk, file, line);
+   LOCKSTAT_PROFILE_RELEASE_RWLOCK(lockmgr__release, lk, 
LOCKSTAT_WRITER);
} else {
return (lockmgr_xunlock_

svn commit: r357070 - head/sys/kern

Author: mjg
Date: Fri Jan 24 07:44:25 2020
New Revision: 357070
URL: https://svnweb.freebsd.org/changeset/base/357070

Log:
  vfs: stop unlocking the vnode upfront in vput
  
  Doing so runs into races with filesystems which make half-constructed vnodes
  visible to other users, while depending on the chain vput -> vinactive ->
  vrecycle to be executed without dropping the vnode lock.
  
  Impediments for making this work got cleared up (notably vop_unlock_post now
  does not do anything and lockmgr stops touching the lock after the final
  write). Stacked filesystems keep vhold/vdrop across unlock, which arguably can
  now be eliminated.
  
  Reviewed by:  jeff
  Differential Revision:https://reviews.freebsd.org/D23344

Modified:
  head/sys/kern/vfs_subr.c

Modified: head/sys/kern/vfs_subr.c
==
--- head/sys/kern/vfs_subr.cFri Jan 24 07:42:57 2020(r357069)
+++ head/sys/kern/vfs_subr.cFri Jan 24 07:44:25 2020(r357070)
@@ -3088,6 +3088,11 @@ enum vputx_op { VPUTX_VRELE, VPUTX_VPUT, VPUTX_VUNREF 
  * Decrement the use and hold counts for a vnode.
  *
  * See an explanation near vget() as to why atomic operation is safe.
+ *
+ * XXX Some filesystems pass in an exclusively locked vnode and strongly depend
+ * on the lock being held all the way until VOP_INACTIVE. This in particular
+ * happens with UFS which adds half-constructed vnodes to the hash, where they
+ * can be found by other code.
  */
 static void
 vputx(struct vnode *vp, enum vputx_op func)
@@ -3097,6 +3102,8 @@ vputx(struct vnode *vp, enum vputx_op func)
KASSERT(vp != NULL, ("vputx: null vp"));
if (func == VPUTX_VUNREF)
ASSERT_VOP_LOCKED(vp, "vunref");
+   else if (func == VPUTX_VPUT)
+   ASSERT_VOP_LOCKED(vp, "vput");
ASSERT_VI_UNLOCKED(vp, __func__);
VNASSERT(vp->v_holdcnt > 0 && vp->v_usecount > 0, vp,
("%s: wrong ref counts", __func__));
@@ -3112,22 +3119,19 @@ vputx(struct vnode *vp, enum vputx_op func)
 * count which provides liveness of the vnode, in which case we
 * have to vdrop.
 */
-   if (!refcount_release(&vp->v_usecount))
+   if (!refcount_release(&vp->v_usecount)) {
+   if (func == VPUTX_VPUT)
+   VOP_UNLOCK(vp);
return;
+   }
VI_LOCK(vp);
v_decr_devcount(vp);
/*
 * By the time we got here someone else might have transitioned
 * the count back to > 0.
 */
-   if (vp->v_usecount > 0) {
-   vdropl(vp);
-   return;
-   }
-   if (vp->v_iflag & VI_DOINGINACT) {
-   vdropl(vp);
-   return;
-   }
+   if (vp->v_usecount > 0 || vp->v_iflag & VI_DOINGINACT)
+   goto out;
 
/*
 * Check if the fs wants to perform inactive processing. Note we
@@ -3137,10 +3141,8 @@ vputx(struct vnode *vp, enum vputx_op func)
 * here but to drop our hold count.
 */
if (__predict_false(VN_IS_DOOMED(vp)) ||
-   VOP_NEED_INACTIVE(vp) == 0) {
-   vdropl(vp);
-   return;
-   }
+   VOP_NEED_INACTIVE(vp) == 0)
+   goto out;
 
/*
 * We must call VOP_INACTIVE with the node locked. Mark
@@ -3153,8 +3155,12 @@ vputx(struct vnode *vp, enum vputx_op func)
VI_LOCK(vp);
break;
case VPUTX_VPUT:
-   error = VOP_LOCK(vp, LK_EXCLUSIVE | LK_INTERLOCK | LK_NOWAIT);
-   VI_LOCK(vp);
+   error = 0;
+   if (VOP_ISLOCKED(vp) != LK_EXCLUSIVE) {
+   error = VOP_LOCK(vp, LK_UPGRADE | LK_INTERLOCK |
+   LK_NOWAIT);
+   VI_LOCK(vp);
+   }
break;
case VPUTX_VUNREF:
error = 0;
@@ -3177,6 +3183,11 @@ vputx(struct vnode *vp, enum vputx_op func)
} else {
vdropl(vp);
}
+   return;
+out:
+   if (func == VPUTX_VPUT)
+   VOP_UNLOCK(vp);
+   vdropl(vp);
 }
 
 /*
@@ -3194,21 +3205,11 @@ vrele(struct vnode *vp)
  * Release an already locked vnode.  This give the same effects as
  * unlock+vrele(), but takes less time and avoids releasing and
  * re-aquiring the lock (as vrele() acquires the lock internally.)
- *
- * It is an invariant that all VOP_* calls operate on a held vnode.
- * We may be only having an implicit hold stemming from our usecount,
- * which we are about to release. If we unlock the vnode afterwards we
- * open a time window where someone else dropped the last usecount and
- * proceeded to free the vnode before our unlock finished. For this
- * reason we unlock the vnode early. This is a little bit wasteful as
- * it may be the vnode is exclusively locked and inactive processing is
- * needed, in which case we are adding work.
  */

svn commit: r357071 - in head/sys: kern ufs/ffs

Author: mjg
Date: Fri Jan 24 07:45:59 2020
New Revision: 357071
URL: https://svnweb.freebsd.org/changeset/base/357071

Log:
  vfs: stop handling VI_OWEINACT in vget
  
  vget is almost always called with LK_SHARED, meaning the flag (if present) is
  almost guaranteed to get cleared. Stop handling it in the first place and
  instead let the thread which wanted to do inactive handle the bumepd usecount.
  
  Reviewed by:  jeff
  Tested by:pho
  Differential Revision:https://reviews.freebsd.org/D23184

Modified:
  head/sys/kern/vfs_subr.c
  head/sys/ufs/ffs/ffs_snapshot.c

Modified: head/sys/kern/vfs_subr.c
==
--- head/sys/kern/vfs_subr.cFri Jan 24 07:44:25 2020(r357070)
+++ head/sys/kern/vfs_subr.cFri Jan 24 07:45:59 2020(r357071)
@@ -2860,7 +2860,7 @@ vget(struct vnode *vp, int flags, struct thread *td)
 int
 vget_finish(struct vnode *vp, int flags, enum vgetstate vs)
 {
-   int error, oweinact;
+   int error;
 
VNASSERT((flags & LK_TYPE_MASK) != 0, vp,
("%s: invalid lock operation", __func__));
@@ -2887,8 +2887,6 @@ vget_finish(struct vnode *vp, int flags, enum vgetstat
}
 
if (vs == VGET_USECOUNT) {
-   VNASSERT((vp->v_iflag & VI_OWEINACT) == 0, vp,
-   ("%s: vnode with usecount and VI_OWEINACT set", __func__));
return (0);
}
 
@@ -2904,9 +2902,6 @@ vget_finish(struct vnode *vp, int flags, enum vgetstat
 #else
refcount_release(&vp->v_holdcnt);
 #endif
-   VNODE_REFCOUNT_FENCE_ACQ();
-   VNASSERT((vp->v_iflag & VI_OWEINACT) == 0, vp,
-   ("%s: vnode with usecount and VI_OWEINACT set", __func__));
return (0);
}
 
@@ -2930,25 +2925,11 @@ vget_finish(struct vnode *vp, int flags, enum vgetstat
 #else
refcount_release(&vp->v_holdcnt);
 #endif
-   VNODE_REFCOUNT_FENCE_ACQ();
-   VNASSERT((vp->v_iflag & VI_OWEINACT) == 0, vp,
-   ("%s: vnode with usecount and VI_OWEINACT set",
-   __func__));
VI_UNLOCK(vp);
return (0);
}
-   if ((vp->v_iflag & VI_OWEINACT) == 0) {
-   oweinact = 0;
-   } else {
-   oweinact = 1;
-   vp->v_iflag &= ~VI_OWEINACT;
-   VNODE_REFCOUNT_FENCE_REL();
-   }
v_incr_devcount(vp);
refcount_acquire(&vp->v_usecount);
-   if (oweinact && VOP_ISLOCKED(vp) == LK_EXCLUSIVE &&
-   (flags & LK_NOWAIT) == 0)
-   vinactive(vp);
VI_UNLOCK(vp);
return (0);
 }
@@ -2967,8 +2948,6 @@ vref(struct vnode *vp)
VNODE_REFCOUNT_FENCE_ACQ();
VNASSERT(vp->v_holdcnt > 0, vp,
("%s: active vnode not held", __func__));
-   VNASSERT((vp->v_iflag & VI_OWEINACT) == 0, vp,
-   ("%s: vnode with usecount and VI_OWEINACT set", __func__));
return;
}
VI_LOCK(vp);
@@ -2986,15 +2965,9 @@ vrefl(struct vnode *vp)
VNODE_REFCOUNT_FENCE_ACQ();
VNASSERT(vp->v_holdcnt > 0, vp,
("%s: active vnode not held", __func__));
-   VNASSERT((vp->v_iflag & VI_OWEINACT) == 0, vp,
-   ("%s: vnode with usecount and VI_OWEINACT set", __func__));
return;
}
vholdl(vp);
-   if ((vp->v_iflag & VI_OWEINACT) != 0) {
-   vp->v_iflag &= ~VI_OWEINACT;
-   VNODE_REFCOUNT_FENCE_REL();
-   }
v_incr_devcount(vp);
refcount_acquire(&vp->v_usecount);
 }
@@ -3052,8 +3025,8 @@ vdefer_inactive(struct vnode *vp)
 {
 
ASSERT_VI_LOCKED(vp, __func__);
-   VNASSERT(vp->v_iflag & VI_OWEINACT, vp,
-   ("%s: vnode without VI_OWEINACT", __func__));
+   VNASSERT(vp->v_holdcnt > 0, vp,
+   ("%s: vnode without hold count", __func__));
if (VN_IS_DOOMED(vp)) {
vdropl(vp);
return;
@@ -3063,6 +3036,11 @@ vdefer_inactive(struct vnode *vp)
vdropl(vp);
return;
}
+   if (vp->v_usecount > 0) {
+   vp->v_iflag &= ~VI_OWEINACT;
+   vdropl(vp);
+   return;
+   }
vlazy(vp);
vp->v_iflag |= VI_DEFINACT;
VI_UNLOCK(vp);
@@ -3070,11 +3048,10 @@ vdefer_inactive(struct vnode *vp)
 }
 
 static void
-vdefer_inactive_cond(struct vnode *vp)
+vdefer_inactive_unlocked(struct vnode *vp)
 {
 
VI_LOCK(vp);
-   VNASSERT(vp->v_holdcnt > 0, vp, ("vnode without hold count"));
if ((vp->v_iflag & VI_OWEINACT) == 0) {
vdropl(vp);
return;
@@ -3173,15 +3150,12 @@ vputx(struct vnode *vp, enum vputx_op func)
VNASSERT(vp->v_usecount == 0 || (vp->v_iflag & VI_OWEINACT) == 0, vp,
("vnode with usecount an

svn commit: r357072 - head/sys/kern