From owner-svn-src-head@freebsd.org Fri Oct 20 21:41:02 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6B061E4093D; Fri, 20 Oct 2017 21:41:02 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4619166E74; Fri, 20 Oct 2017 21:41:02 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9KLf1Qc069246; Fri, 20 Oct 2017 21:41:01 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9KLexFK069227; Fri, 20 Oct 2017 21:40:59 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201710202140.v9KLexFK069227@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Fri, 20 Oct 2017 21:40:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r324810 - in head/sys: amd64/conf arm/conf arm64/conf conf i386/conf mips/conf net powerpc/conf riscv/conf sparc64/conf X-SVN-Group: head X-SVN-Commit-Author: bz X-SVN-Commit-Paths: in head/sys: amd64/conf arm/conf arm64/conf conf i386/conf mips/conf net powerpc/conf riscv/conf sparc64/conf X-SVN-Commit-Revision: 324810 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Oct 2017 21:41:02 -0000 Author: bz Date: Fri Oct 20 21:40:59 2017 New Revision: 324810 URL: https://svnweb.freebsd.org/changeset/base/324810 Log: With r181803 on 2008-08-17 23:27:27Z the first VIMAGE commit went into HEAD. Enable VIMAGE in GENERIC kernels and some others (where GENERIC does not exist) on HEAD. Disable building LINT-VIMAGE with VIMAGE being default. This should give it a lot more exposure in the run-up to 12 to help us evaluate whether to keep it on by default or not. We are also hoping to get better performance testing. The feature can be disabled using nooptions. Requested by: many Reviewed by: kristof, emaste, hiren X-MFC after: never Relnotes: yes Differential Revision: https://reviews.freebsd.org/D12639 Modified: head/sys/amd64/conf/GENERIC head/sys/arm/conf/std.armv6 head/sys/arm/conf/std.armv7 head/sys/arm64/conf/GENERIC head/sys/conf/NOTES head/sys/conf/makeLINT.mk head/sys/i386/conf/GENERIC head/sys/mips/conf/GXEMUL head/sys/mips/conf/GXEMUL32 head/sys/mips/conf/QEMU head/sys/net/vnet.c head/sys/powerpc/conf/GENERIC head/sys/powerpc/conf/GENERIC64 head/sys/riscv/conf/GENERIC head/sys/sparc64/conf/GENERIC Modified: head/sys/amd64/conf/GENERIC ============================================================================== --- head/sys/amd64/conf/GENERIC Fri Oct 20 21:13:19 2017 (r324809) +++ head/sys/amd64/conf/GENERIC Fri Oct 20 21:40:59 2017 (r324810) @@ -26,6 +26,7 @@ makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption +options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols options IPSEC # IP (v4/v6) security Modified: head/sys/arm/conf/std.armv6 ============================================================================== --- head/sys/arm/conf/std.armv6 Fri Oct 20 21:13:19 2017 (r324809) +++ head/sys/arm/conf/std.armv6 Fri Oct 20 21:40:59 2017 (r324810) @@ -5,6 +5,7 @@ options HZ=1000 options ARM_L2_PIPT # Only L2 PIPT is supported options PREEMPTION # Enable kernel thread preemption +options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols options TCP_HHOOK # hhook(9) framework for TCP Modified: head/sys/arm/conf/std.armv7 ============================================================================== --- head/sys/arm/conf/std.armv7 Fri Oct 20 21:13:19 2017 (r324809) +++ head/sys/arm/conf/std.armv7 Fri Oct 20 21:40:59 2017 (r324810) @@ -5,6 +5,7 @@ options HZ=1000 options ARM_L2_PIPT # Only L2 PIPT is supported options PREEMPTION # Enable kernel thread preemption +options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols options TCP_HHOOK # hhook(9) framework for TCP Modified: head/sys/arm64/conf/GENERIC ============================================================================== --- head/sys/arm64/conf/GENERIC Fri Oct 20 21:13:19 2017 (r324809) +++ head/sys/arm64/conf/GENERIC Fri Oct 20 21:40:59 2017 (r324810) @@ -26,6 +26,7 @@ makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption +options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols options IPSEC # IP (v4/v6) security Modified: head/sys/conf/NOTES ============================================================================== --- head/sys/conf/NOTES Fri Oct 20 21:13:19 2017 (r324809) +++ head/sys/conf/NOTES Fri Oct 20 21:40:59 2017 (r324810) @@ -802,8 +802,8 @@ options NGATM_CCATM device mn # Munich32x/Falc54 Nx64kbit/sec cards. # Network stack virtualization. -#options VIMAGE -#options VNET_DEBUG # debug for VIMAGE +options VIMAGE +options VNET_DEBUG # debug for VIMAGE # # Network interfaces: Modified: head/sys/conf/makeLINT.mk ============================================================================== --- head/sys/conf/makeLINT.mk Fri Oct 20 21:13:19 2017 (r324809) +++ head/sys/conf/makeLINT.mk Fri Oct 20 21:40:59 2017 (r324810) @@ -6,16 +6,13 @@ all: clean: rm -f LINT .if ${TARGET} == "amd64" || ${TARGET} == "i386" - rm -f LINT-VIMAGE LINT-NOINET LINT-NOINET6 LINT-NOIP + rm -f LINT-NOINET LINT-NOINET6 LINT-NOIP .endif NOTES= ../../conf/NOTES NOTES LINT: ${NOTES} ../../conf/makeLINT.sed cat ${NOTES} | sed -E -n -f ../../conf/makeLINT.sed > ${.TARGET} .if ${TARGET} == "amd64" || ${TARGET} == "i386" - echo "include ${.TARGET}" > ${.TARGET}-VIMAGE - echo "ident ${.TARGET}-VIMAGE" >> ${.TARGET}-VIMAGE - echo "options VIMAGE" >> ${.TARGET}-VIMAGE echo "include ${.TARGET}" > ${.TARGET}-NOINET echo "ident ${.TARGET}-NOINET" >> ${.TARGET}-NOINET echo 'makeoptions MKMODULESENV+="WITHOUT_INET_SUPPORT="' >> ${.TARGET}-NOINET Modified: head/sys/i386/conf/GENERIC ============================================================================== --- head/sys/i386/conf/GENERIC Fri Oct 20 21:13:19 2017 (r324809) +++ head/sys/i386/conf/GENERIC Fri Oct 20 21:40:59 2017 (r324810) @@ -28,6 +28,7 @@ makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption +options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols options IPSEC # IP (v4/v6) security Modified: head/sys/mips/conf/GXEMUL ============================================================================== --- head/sys/mips/conf/GXEMUL Fri Oct 20 21:13:19 2017 (r324809) +++ head/sys/mips/conf/GXEMUL Fri Oct 20 21:40:59 2017 (r324810) @@ -30,6 +30,7 @@ options KDB options SMP # Symmetric MultiProcessor Kernel options SCHED_ULE +options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols options TCP_HHOOK # hhook(9) framework for TCP Modified: head/sys/mips/conf/GXEMUL32 ============================================================================== --- head/sys/mips/conf/GXEMUL32 Fri Oct 20 21:13:19 2017 (r324809) +++ head/sys/mips/conf/GXEMUL32 Fri Oct 20 21:40:59 2017 (r324810) @@ -28,6 +28,7 @@ options KDB options SMP # Symmetric MultiProcessor Kernel options SCHED_ULE +options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols options TCP_HHOOK # hhook(9) framework for TCP Modified: head/sys/mips/conf/QEMU ============================================================================== --- head/sys/mips/conf/QEMU Fri Oct 20 21:13:19 2017 (r324809) +++ head/sys/mips/conf/QEMU Fri Oct 20 21:40:59 2017 (r324810) @@ -31,6 +31,7 @@ options DDB options KDB options SCHED_4BSD #4BSD scheduler +options VIMAGE # Subsystem virtualization, e.g. VNET options INET #InterNETworking options TCP_HHOOK # hhook(9) framework for TCP options NFSCL #Network Filesystem Client @@ -44,6 +45,11 @@ options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B r #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed + +# The `bpf' device enables the Berkeley Packet Filter. +# Be aware of the administrative consequences of enabling this! +# Note that 'bpf' is required for DHCP. +device bpf # Berkeley packet filter device loop device ether Modified: head/sys/net/vnet.c ============================================================================== --- head/sys/net/vnet.c Fri Oct 20 21:13:19 2017 (r324809) +++ head/sys/net/vnet.c Fri Oct 20 21:40:59 2017 (r324810) @@ -312,9 +312,8 @@ static void vnet0_init(void *arg __unused) { - /* Warn people before take off - in case we crash early. */ - printf("WARNING: VIMAGE (virtualized network stack) is a highly " - "experimental feature.\n"); + if (bootverbose) + printf("VIMAGE (virtualized network stack) enabled\n"); /* * We MUST clear curvnet in vi_init_done() before going SMP, Modified: head/sys/powerpc/conf/GENERIC ============================================================================== --- head/sys/powerpc/conf/GENERIC Fri Oct 20 21:13:19 2017 (r324809) +++ head/sys/powerpc/conf/GENERIC Fri Oct 20 21:40:59 2017 (r324810) @@ -35,6 +35,7 @@ options PSERIES #PAPR-compliant systems options FDT options SCHED_ULE #ULE scheduler options PREEMPTION #Enable kernel thread preemption +options VIMAGE # Subsystem virtualization, e.g. VNET options INET #InterNETworking options INET6 #IPv6 communications protocols options IPSEC # IP (v4/v6) security Modified: head/sys/powerpc/conf/GENERIC64 ============================================================================== --- head/sys/powerpc/conf/GENERIC64 Fri Oct 20 21:13:19 2017 (r324809) +++ head/sys/powerpc/conf/GENERIC64 Fri Oct 20 21:40:59 2017 (r324810) @@ -35,6 +35,7 @@ options PSERIES #PAPR-compliant systems (e.g. IBM p options FDT #Flattened Device Tree options SCHED_ULE #ULE scheduler options PREEMPTION #Enable kernel thread preemption +options VIMAGE # Subsystem virtualization, e.g. VNET options INET #InterNETworking options INET6 #IPv6 communications protocols options TCP_HHOOK # hhook(9) framework for TCP Modified: head/sys/riscv/conf/GENERIC ============================================================================== --- head/sys/riscv/conf/GENERIC Fri Oct 20 21:13:19 2017 (r324809) +++ head/sys/riscv/conf/GENERIC Fri Oct 20 21:40:59 2017 (r324810) @@ -30,6 +30,7 @@ makeoptions WITHOUT_MODULES="usb otusfw mwlfw ispfw mw options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption +options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols options TCP_HHOOK # hhook(9) framework for TCP Modified: head/sys/sparc64/conf/GENERIC ============================================================================== --- head/sys/sparc64/conf/GENERIC Fri Oct 20 21:13:19 2017 (r324809) +++ head/sys/sparc64/conf/GENERIC Fri Oct 20 21:40:59 2017 (r324810) @@ -28,6 +28,7 @@ makeoptions DEBUG=-g # Build kernel with gdb(1) debug options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption +options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols options IPSEC # IP (v4/v6) security