From owner-svn-src-head@freebsd.org Sun Oct 7 01:53:45 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3864310A9A46; Sun, 7 Oct 2018 01:53:45 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D309C8D85B; Sun, 7 Oct 2018 01:53:44 +0000 (UTC) (envelope-from kevans@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AE21E5658; Sun, 7 Oct 2018 01:53:44 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w971ricA035604; Sun, 7 Oct 2018 01:53:44 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w971rhEq035600; Sun, 7 Oct 2018 01:53:43 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201810070153.w971rhEq035600@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Sun, 7 Oct 2018 01:53:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339218 - in head: . stand/defaults stand/lua X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in head: . stand/defaults stand/lua X-SVN-Commit-Revision: 339218 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.27 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: Sun, 07 Oct 2018 01:53:45 -0000 Author: kevans Date: Sun Oct 7 01:53:43 2018 New Revision: 339218 URL: https://svnweb.freebsd.org/changeset/base/339218 Log: lualoader: Create a module blacklist, add DRM modules to it This is a step in the process of easing migration into the new world order of DRM drivers. Strongly encourage users towards loading DRM modules via rc.conf(5) instead of loader.conf(5) by failing the load from loader(8). Users so inclined may wipe out the blacklist via module_blacklist="" in loader.conf(5), and it is expected that these modules will eventually be removed from the blacklist. They may still be loaded as dependencies of other modules or explicitly via the loader prompt, but this should not be a major problem. Approved by: re (rgrimes) Relnotes: yes Differential Revision: https://reviews.freebsd.org/D16914 Modified: head/UPDATING head/stand/defaults/loader.conf head/stand/defaults/loader.conf.5 head/stand/lua/config.lua Modified: head/UPDATING ============================================================================== --- head/UPDATING Sun Oct 7 00:40:56 2018 (r339217) +++ head/UPDATING Sun Oct 7 01:53:43 2018 (r339218) @@ -31,6 +31,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20181006: + The legacy DRM modules and drivers have now been added to the loader's + module blacklist, in favor of loading them with kld_list in rc.conf(5). + The module blacklist may be overridden with the loader.conf(5) + 'module_blacklist' variable, but loading them via rc.conf(5) is strongly + encouraged. + 20181002: The cam(4) based nda(4) driver will be used over nvd(4) by default on powerpc64. You may set 'options NVME_USE_NVD=1' in your kernel conf or Modified: head/stand/defaults/loader.conf ============================================================================== --- head/stand/defaults/loader.conf Sun Oct 7 00:40:56 2018 (r339217) +++ head/stand/defaults/loader.conf Sun Oct 7 01:53:43 2018 (r339218) @@ -97,6 +97,7 @@ efi_max_resolution="1x1" # Set the max resolution for #console="vidconsole" # A comma separated list of console(s) #currdev="disk1s1a" # Set the current device module_path="/boot/modules;/boot/dtb;/boot/dtb/overlays" # Set the module search path +module_blacklist="drm drm2 radeonkms i915kms amdgpu" # Loader module blacklist #prompt="\\${interpret}" # Set the command prompt #root_disk_unit="0" # Force the root disk unit number #rootdev="disk1s1a" # Set the root filesystem Modified: head/stand/defaults/loader.conf.5 ============================================================================== --- head/stand/defaults/loader.conf.5 Sun Oct 7 00:40:56 2018 (r339217) +++ head/stand/defaults/loader.conf.5 Sun Oct 7 01:53:43 2018 (r339218) @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD$ -.Dd August 28, 2018 +.Dd October 6, 2018 .Dt LOADER.CONF 5 .Os .Sh NAME @@ -147,6 +147,15 @@ If a password is set, the user must provide specified If set to .Dq YES , module names will be displayed as they are loaded. +.It Ar module_blacklist +Blacklist of modules. +Modules specified in the blacklist may not be loaded automatically with a +.Ar *_load +directive, but they may be loaded directly at the +.Xr loader 8 +prompt. +Blacklisted modules may still be loaded indirectly as dependencies of other +moduled. .It Ar *_load If set to .Dq YES , Modified: head/stand/lua/config.lua ============================================================================== --- head/stand/lua/config.lua Sun Oct 7 00:40:56 2018 (r339217) +++ head/stand/lua/config.lua Sun Oct 7 01:53:43 2018 (r339218) @@ -54,6 +54,7 @@ local MSG_XENKERNFAIL = "Failed to load Xen kernel '%s local MSG_XENKERNLOADING = "Loading Xen kernel..." local MSG_KERNLOADING = "Loading kernel..." local MSG_MODLOADING = "Loading configured modules..." +local MSG_MODBLACKLIST = "Not loading blacklisted module '%s'" local MSG_MODLOADFAIL = "Could not load one or more modules!" local MODULEEXPR = '([%w-_]+)' @@ -265,20 +266,37 @@ local function isValidComment(line) return true end +local function getBlacklist() + local blacklist_str = loader.getenv('module_blacklist') + if blacklist_str == nil then + return nil + end + + local blacklist = {} + for mod in blacklist_str:gmatch("[;, ]?([%w-_]+)[;, ]?") do + blacklist[mod] = true + end + return blacklist +end + local function loadModule(mod, silent) local status = true + local blacklist = getBlacklist() local pstatus for k, v in pairs(mod) do if v.load ~= nil and v.load:lower() == "yes" then + local module_name = v.name or k + if blacklist[module_name] ~= nil then + if not silent then + print(MSG_MODBLACKLIST:format(module_name)) + end + goto continue + end local str = "load " if v.type ~= nil then str = str .. "-t " .. v.type .. " " end - if v.name ~= nil then - str = str .. v.name - else - str = str .. k - end + str = str .. module_name if v.flags ~= nil then str = str .. " " .. v.flags end @@ -309,6 +327,7 @@ local function loadModule(mod, silent) end end + ::continue:: end return status From owner-svn-src-head@freebsd.org Sun Oct 7 11:26:16 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 145A710BEE41; Sun, 7 Oct 2018 11:26:16 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AED9E80D75; Sun, 7 Oct 2018 11:26:15 +0000 (UTC) (envelope-from tuexen@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A422613422; Sun, 7 Oct 2018 11:26:15 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w97BQFqf030296; Sun, 7 Oct 2018 11:26:15 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w97BQFAB030295; Sun, 7 Oct 2018 11:26:15 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201810071126.w97BQFAB030295@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Sun, 7 Oct 2018 11:26:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339219 - head/sys/netinet X-SVN-Group: head X-SVN-Commit-Author: tuexen X-SVN-Commit-Paths: head/sys/netinet X-SVN-Commit-Revision: 339219 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.27 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: Sun, 07 Oct 2018 11:26:16 -0000 Author: tuexen Date: Sun Oct 7 11:26:15 2018 New Revision: 339219 URL: https://svnweb.freebsd.org/changeset/base/339219 Log: Ensure that the ips_localout counter is incremented for locally generated SCTP packets sent over IPv4. This make the behaviour consistent with IPv6. Reviewed by: ae@, bz@, jtl@ Approved by: re (kib@) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D17406 Modified: head/sys/netinet/ip_output.c Modified: head/sys/netinet/ip_output.c ============================================================================== --- head/sys/netinet/ip_output.c Sun Oct 7 01:53:43 2018 (r339218) +++ head/sys/netinet/ip_output.c Sun Oct 7 11:26:15 2018 (r339219) @@ -262,11 +262,12 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct rou ip->ip_v = IPVERSION; ip->ip_hl = hlen >> 2; ip_fillid(ip); - IPSTAT_INC(ips_localout); } else { /* Header already set, fetch hlen from there */ hlen = ip->ip_hl << 2; } + if ((flags & IP_FORWARDING) == 0) + IPSTAT_INC(ips_localout); /* * dst/gw handling: From owner-svn-src-head@freebsd.org Sun Oct 7 12:56:06 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B90CD10C2037; Sun, 7 Oct 2018 12:56:06 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6866B83C9A; Sun, 7 Oct 2018 12:56:06 +0000 (UTC) (envelope-from tuexen@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5C290142C1; Sun, 7 Oct 2018 12:56:06 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w97Cu6d2076346; Sun, 7 Oct 2018 12:56:06 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w97Cu5F5076344; Sun, 7 Oct 2018 12:56:05 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201810071256.w97Cu5F5076344@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Sun, 7 Oct 2018 12:56:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339220 - head/sys/powerpc/conf X-SVN-Group: head X-SVN-Commit-Author: tuexen X-SVN-Commit-Paths: head/sys/powerpc/conf X-SVN-Commit-Revision: 339220 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.27 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: Sun, 07 Oct 2018 12:56:06 -0000 Author: tuexen Date: Sun Oct 7 12:56:05 2018 New Revision: 339220 URL: https://svnweb.freebsd.org/changeset/base/339220 Log: Enable TCP Fast Open support for PPC platforms. Reviewed by: kbowling@, andreast@ Approved by: re (kib@) Differential Revision: https://reviews.freebsd.org/D17407 Modified: head/sys/powerpc/conf/GENERIC head/sys/powerpc/conf/GENERIC64 Modified: head/sys/powerpc/conf/GENERIC ============================================================================== --- head/sys/powerpc/conf/GENERIC Sun Oct 7 11:26:15 2018 (r339219) +++ head/sys/powerpc/conf/GENERIC Sun Oct 7 12:56:05 2018 (r339220) @@ -41,6 +41,7 @@ options INET6 #IPv6 communications protocols options IPSEC # IP (v4/v6) security options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5 options TCP_HHOOK # hhook(9) framework for TCP +options TCP_RFC7413 # TCP Fast Open options SCTP #Stream Control Transmission Protocol options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support Modified: head/sys/powerpc/conf/GENERIC64 ============================================================================== --- head/sys/powerpc/conf/GENERIC64 Sun Oct 7 11:26:15 2018 (r339219) +++ head/sys/powerpc/conf/GENERIC64 Sun Oct 7 12:56:05 2018 (r339220) @@ -40,6 +40,7 @@ options VIMAGE # Subsystem virtualization, e.g. VNE options INET #InterNETworking options INET6 #IPv6 communications protocols options TCP_HHOOK # hhook(9) framework for TCP +options TCP_RFC7413 # TCP Fast Open options SCTP #Stream Control Transmission Protocol options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support From owner-svn-src-head@freebsd.org Sun Oct 7 12:57:44 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E650A10C216B; Sun, 7 Oct 2018 12:57:43 +0000 (UTC) (envelope-from mpp302@gmail.com) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 722DE83F05; Sun, 7 Oct 2018 12:57:43 +0000 (UTC) (envelope-from mpp302@gmail.com) Received: by mail-wr1-f46.google.com with SMTP id a2-v6so10822638wrc.13; Sun, 07 Oct 2018 05:57:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=35+ytME7CvlSNKRUHdIewsnkz5PyySw22kSIqgU9O/g=; b=srcBqWzh/oxG4Ztbg/uNcNHb91Lp0axwIjrtu1YOfNSOn4MvXN9hSLi3766t+5BjNt tSf/lQJgs7dInZmF2NIQOfKQbo+iOc6e5OkFNwPAkaaYlTExyqDTYeLw3t880qEyoZjS K2KpluX5v7JORGgA7NUoswknngeYAgZElWYqdDMyG5/eRVFzFXx7iPzvexwuBk+YiVPb aRVJWiL4lLPMZQnfsCUJqv/hZQDDTjidPT7vNTUV1OovS/4pWe/8XP98d9viERi2AmwU n7n3KhzLccEcj0icp2Sw5TyWa6pwEDfanVy/KxAzn4zPsdfLfmjLlQeOJPtkHFD0A7hm giBw== X-Gm-Message-State: ABuFfojOEJ0ehoeg9zOpCByANIObFSc9Q2MEX8V/luM7jj0iiDOp4j2i iWhsHOiPbThlYvMtNKZkPu0oikJ+x95Bxg== X-Google-Smtp-Source: ACcGV62kE79eEoQswad8S3zuSq4XHMqGS58DCwAy1h2s1W5hg4MIdmbPjHXQ5wio43GHciLJi9fCiA== X-Received: by 2002:adf:a144:: with SMTP id r4-v6mr13298374wrr.169.1538916744477; Sun, 07 Oct 2018 05:52:24 -0700 (PDT) Received: from e5500 (x4db37188.dyn.telefonica.de. [77.179.113.136]) by smtp.gmail.com with ESMTPSA id u76-v6sm14776429wmd.10.2018.10.07.05.52.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 07 Oct 2018 05:52:24 -0700 (PDT) Date: Sun, 7 Oct 2018 14:52:19 +0200 From: Mateusz Piotrowski <0mp@FreeBSD.org> To: Kyle Evans Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r339218 - in head: . stand/defaults stand/lua Message-ID: <20181007145219.36e54ed3@e5500> In-Reply-To: <201810070153.w971rhEq035600@repo.freebsd.org> References: <201810070153.w971rhEq035600@repo.freebsd.org> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; i386-portbld-freebsd11.1) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 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: Sun, 07 Oct 2018 12:57:44 -0000 On Sun, 7 Oct 2018 01:53:43 +0000 (UTC) Kyle Evans wrote: >Author: kevans >Date: Sun Oct 7 01:53:43 2018 >New Revision: 339218 >URL: https://svnweb.freebsd.org/changeset/base/339218 > >Log: > lualoader: Create a module blacklist, add DRM modules to it > > This is a step in the process of easing migration into the new world order > of DRM drivers. Strongly encourage users towards loading DRM modules via > rc.conf(5) instead of loader.conf(5) by failing the load from loader(8). > Users so inclined may wipe out the blacklist via module_blacklist="" in > loader.conf(5), and it is expected that these modules will eventually be > removed from the blacklist. They may still be loaded as dependencies of > other modules or explicitly via the loader prompt, but this should not be a > major problem. > > Approved by: re (rgrimes) > Relnotes: yes > Differential Revision: https://reviews.freebsd.org/D16914 > >Modified: > head/UPDATING > head/stand/defaults/loader.conf > head/stand/defaults/loader.conf.5 > head/stand/lua/config.lua > > [...] > >Modified: head/stand/defaults/loader.conf.5 >============================================================================== >--- head/stand/defaults/loader.conf.5 Sun Oct 7 00:40:56 2018 (r339217) >+++ head/stand/defaults/loader.conf.5 Sun Oct 7 01:53:43 2018 (r339218) >@@ -23,7 +23,7 @@ > .\" SUCH DAMAGE. > .\" > .\" $FreeBSD$ >-.Dd August 28, 2018 >+.Dd October 6, 2018 > .Dt LOADER.CONF 5 > .Os > .Sh NAME >@@ -147,6 +147,15 @@ If a password is set, the user must provide specified > If set to > .Dq YES , > module names will be displayed as they are loaded. >+.It Ar module_blacklist >+Blacklist of modules. >+Modules specified in the blacklist may not be loaded automatically with a >+.Ar *_load >+directive, but they may be loaded directly at the >+.Xr loader 8 >+prompt. >+Blacklisted modules may still be loaded indirectly as dependencies of other >+moduled. Do you think that the users might benefit from adding a note about the default set of modules included in the list? Something like: Default: .Dq drm drm2 radeonkms i915kms amdgpu . From owner-svn-src-head@freebsd.org Sun Oct 7 15:13:48 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AEDF710C47A7; Sun, 7 Oct 2018 15:13:48 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 574BE8801D; Sun, 7 Oct 2018 15:13:48 +0000 (UTC) (envelope-from tuexen@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4C7C315978; Sun, 7 Oct 2018 15:13:48 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w97FDmrr048155; Sun, 7 Oct 2018 15:13:48 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w97FDmkp048154; Sun, 7 Oct 2018 15:13:48 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201810071513.w97FDmkp048154@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Sun, 7 Oct 2018 15:13:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339221 - head/sys/netinet X-SVN-Group: head X-SVN-Commit-Author: tuexen X-SVN-Commit-Paths: head/sys/netinet X-SVN-Commit-Revision: 339221 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.27 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: Sun, 07 Oct 2018 15:13:48 -0000 Author: tuexen Date: Sun Oct 7 15:13:47 2018 New Revision: 339221 URL: https://svnweb.freebsd.org/changeset/base/339221 Log: Avoid truncating unrecognised parameters when reporting them. This resulted in sending malformed packets. Approved by: re (kib@) MFC after: 1 week Modified: head/sys/netinet/sctp_output.c Modified: head/sys/netinet/sctp_output.c ============================================================================== --- head/sys/netinet/sctp_output.c Sun Oct 7 12:56:05 2018 (r339220) +++ head/sys/netinet/sctp_output.c Sun Oct 7 15:13:47 2018 (r339221) @@ -4983,7 +4983,6 @@ sctp_arethere_unrecognized_parameters(struct mbuf *in_ struct sctp_paramhdr *phdr, params; struct mbuf *mat, *op_err; - char tempbuf[SCTP_PARAM_BUFFER_SIZE]; int at, limit, pad_needed; uint16_t ptype, plen, padded_size; int err_at; @@ -5123,15 +5122,13 @@ sctp_arethere_unrecognized_parameters(struct mbuf *in_ l_len = SCTP_MIN_V4_OVERHEAD; #endif l_len += sizeof(struct sctp_chunkhdr); - l_len += plen; - l_len += sizeof(struct sctp_paramhdr); + l_len += sizeof(struct sctp_gen_error_cause); op_err = sctp_get_mbuf_for_msg(l_len, 0, M_NOWAIT, 1, MT_DATA); if (op_err) { SCTP_BUF_LEN(op_err) = 0; /* - * pre-reserve space for ip - * and sctp header and - * chunk hdr + * Pre-reserve space for IP, + * SCTP, and chunk header. */ #ifdef INET6 SCTP_BUF_RESV_UF(op_err, sizeof(struct ip6_hdr)); @@ -5144,7 +5141,7 @@ sctp_arethere_unrecognized_parameters(struct mbuf *in_ } if (op_err) { /* If we have space */ - struct sctp_paramhdr s; + struct sctp_gen_error_cause cause; if (err_at % 4) { uint32_t cpthis = 0; @@ -5153,26 +5150,15 @@ sctp_arethere_unrecognized_parameters(struct mbuf *in_ m_copyback(op_err, err_at, pad_needed, (caddr_t)&cpthis); err_at += pad_needed; } - s.param_type = htons(SCTP_CAUSE_UNRESOLVABLE_ADDR); - s.param_length = htons(sizeof(s) + plen); - m_copyback(op_err, err_at, sizeof(s), (caddr_t)&s); - err_at += sizeof(s); - if (plen > sizeof(tempbuf)) { - plen = sizeof(tempbuf); - } - phdr = sctp_get_next_param(mat, at, (struct sctp_paramhdr *)tempbuf, plen); - if (phdr == NULL) { + cause.code = htons(SCTP_CAUSE_UNRESOLVABLE_ADDR); + cause.length = htons((uint16_t)(sizeof(struct sctp_gen_error_cause) + plen)); + m_copyback(op_err, err_at, sizeof(struct sctp_gen_error_cause), (caddr_t)&cause); + err_at += sizeof(struct sctp_gen_error_cause); + SCTP_BUF_NEXT(op_err) = SCTP_M_COPYM(mat, at, plen, M_NOWAIT); + if (SCTP_BUF_NEXT(op_err) == NULL) { sctp_m_freem(op_err); - /* - * we are out of memory but - * we still need to have a - * look at what to do (the - * system is in trouble - * though). - */ return (NULL); } - m_copyback(op_err, err_at, plen, (caddr_t)phdr); } return (op_err); break; @@ -5196,7 +5182,6 @@ sctp_arethere_unrecognized_parameters(struct mbuf *in_ l_len = SCTP_MIN_V4_OVERHEAD; #endif l_len += sizeof(struct sctp_chunkhdr); - l_len += plen; l_len += sizeof(struct sctp_paramhdr); op_err = sctp_get_mbuf_for_msg(l_len, 0, M_NOWAIT, 1, MT_DATA); if (op_err) { @@ -5222,14 +5207,11 @@ sctp_arethere_unrecognized_parameters(struct mbuf *in_ err_at += pad_needed; } s.param_type = htons(SCTP_UNRECOG_PARAM); - s.param_length = htons(sizeof(s) + plen); - m_copyback(op_err, err_at, sizeof(s), (caddr_t)&s); - err_at += sizeof(s); - if (plen > sizeof(tempbuf)) { - plen = sizeof(tempbuf); - } - phdr = sctp_get_next_param(mat, at, (struct sctp_paramhdr *)tempbuf, plen); - if (phdr == NULL) { + s.param_length = htons((uint16_t)sizeof(struct sctp_paramhdr) + plen); + m_copyback(op_err, err_at, sizeof(struct sctp_paramhdr), (caddr_t)&s); + err_at += sizeof(struct sctp_paramhdr); + SCTP_BUF_NEXT(op_err) = SCTP_M_COPYM(mat, at, plen, M_NOWAIT); + if (SCTP_BUF_NEXT(op_err) == NULL) { sctp_m_freem(op_err); /* * we are out of memory but @@ -5241,7 +5223,6 @@ sctp_arethere_unrecognized_parameters(struct mbuf *in_ op_err = NULL; goto more_processing; } - m_copyback(op_err, err_at, plen, (caddr_t)phdr); err_at += plen; } } From owner-svn-src-head@freebsd.org Sun Oct 7 15:28:51 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8F42010C4BAC; Sun, 7 Oct 2018 15:28:51 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3B77788652; Sun, 7 Oct 2018 15:28:51 +0000 (UTC) (envelope-from kevans@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 183E315B24; Sun, 7 Oct 2018 15:28:51 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w97FSoot054073; Sun, 7 Oct 2018 15:28:50 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w97FSotK054072; Sun, 7 Oct 2018 15:28:50 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201810071528.w97FSotK054072@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Sun, 7 Oct 2018 15:28:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339222 - head/stand/lua X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/stand/lua X-SVN-Commit-Revision: 339222 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.27 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: Sun, 07 Oct 2018 15:28:51 -0000 Author: kevans Date: Sun Oct 7 15:28:50 2018 New Revision: 339222 URL: https://svnweb.freebsd.org/changeset/base/339222 Log: lualoader: Honor boot_* variables at lua init For non-UEFI systems, boot.config(5) may have -s or -v specified for single-user and verbose boot respectively. These were not being properly taken into account and reflected in the "Boot Options" submenu. When we initialize core.lua, we'll record boot_single and boot_verbose as we do ACPI and consider these the system defaults. Reported by: David Wolfskill Approved by: re (kib) Modified: head/stand/lua/core.lua Modified: head/stand/lua/core.lua ============================================================================== --- head/stand/lua/core.lua Sun Oct 7 15:13:47 2018 (r339221) +++ head/stand/lua/core.lua Sun Oct 7 15:28:50 2018 (r339222) @@ -34,6 +34,10 @@ local hook = require("hook") local core = {} +local default_safe_mode = false +local default_single_user = false +local default_verbose = false + local function composeLoaderCmd(cmd_name, argstr) if argstr ~= nil then cmd_name = cmd_name .. " " .. argstr @@ -41,6 +45,26 @@ local function composeLoaderCmd(cmd_name, argstr) return cmd_name end +local function recordDefaults() + -- On i386, hint.acpi.0.rsdp will be set before we're loaded. On !i386, + -- it will generally be set upon execution of the kernel. Because of + -- this, we can't (or don't really want to) detect/disable ACPI on !i386 + -- reliably. Just set it enabled if we detect it and leave well enough + -- alone if we don't. + local boot_acpi = core.isSystem386() and core.getACPIPresent(false) + local boot_single = loader.getenv("boot_single") or "no" + local boot_verbose = loader.getenv("boot_verbose") or "no" + default_single_user = boot_single:lower() ~= "no" + default_verbose = boot_verbose:lower() ~= "no" + + if boot_acpi then + core.setACPI(true) + end + core.setSingleUser(default_single_user) + core.setVerbose(default_verbose) +end + + -- Globals -- try_include will return the loaded module on success, or nil on failure. -- A message will also be printed on failure, with one exception: non-verbose @@ -268,9 +292,9 @@ end function core.setDefaults() core.setACPI(core.getACPIPresent(true)) - core.setSafeMode(false) - core.setSingleUser(false) - core.setVerbose(false) + core.setSafeMode(default_safe_mode) + core.setSingleUser(default_single_user) + core.setVerbose(default_verbose) end function core.autoboot(argstr) @@ -367,13 +391,6 @@ function core.popFrontTable(tbl) return first_value, new_tbl end --- On i386, hint.acpi.0.rsdp will be set before we're loaded. On !i386, it will --- generally be set upon execution of the kernel. Because of this, we can't (or --- don't really want to) detect/disable ACPI on !i386 reliably. Just set it --- enabled if we detect it and leave well enough alone if we don't. -if core.isSystem386() and core.getACPIPresent(false) then - core.setACPI(true) -end - +recordDefaults() hook.register("config.reloaded", core.clearCachedKernels) return core From owner-svn-src-head@freebsd.org Sun Oct 7 15:54:15 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 39FD310C546B; Sun, 7 Oct 2018 15:54:15 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D1EB7893A1; Sun, 7 Oct 2018 15:54:14 +0000 (UTC) (envelope-from tuexen@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C726715FF6; Sun, 7 Oct 2018 15:54:14 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w97FsErh068949; Sun, 7 Oct 2018 15:54:14 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w97FsEiU068945; Sun, 7 Oct 2018 15:54:14 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201810071554.w97FsEiU068945@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Sun, 7 Oct 2018 15:54:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339223 - in head/sys: amd64/conf arm64/conf i386/conf X-SVN-Group: head X-SVN-Commit-Author: tuexen X-SVN-Commit-Paths: in head/sys: amd64/conf arm64/conf i386/conf X-SVN-Commit-Revision: 339223 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.27 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: Sun, 07 Oct 2018 15:54:15 -0000 Author: tuexen Date: Sun Oct 7 15:54:13 2018 New Revision: 339223 URL: https://svnweb.freebsd.org/changeset/base/339223 Log: Address the warning regarding duplicate option 'GEOM_PART_GPT' when configuring kernels for i386, amd64, and arm64. The 'GEOM_PART_GPT' option was added to the DEFAULTS configuration in r337967. Approved by: re (kib@) Reviewed by: ler@ Differential Revision: https://reviews.freebsd.org/D17458 Sponsored by: Netflix, Inc. Modified: head/sys/amd64/conf/GENERIC head/sys/amd64/conf/GENERIC-MMCCAM head/sys/arm64/conf/GENERIC head/sys/i386/conf/GENERIC Modified: head/sys/amd64/conf/GENERIC ============================================================================== --- head/sys/amd64/conf/GENERIC Sun Oct 7 15:28:50 2018 (r339222) +++ head/sys/amd64/conf/GENERIC Sun Oct 7 15:54:13 2018 (r339223) @@ -52,7 +52,6 @@ options MSDOSFS # MSDOS Filesystem options CD9660 # ISO 9660 Filesystem options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework -options GEOM_PART_GPT # GUID Partition Tables. options GEOM_RAID # Soft RAID functionality. options GEOM_LABEL # Provides labelization options EFIRT # EFI Runtime Services support Modified: head/sys/amd64/conf/GENERIC-MMCCAM ============================================================================== --- head/sys/amd64/conf/GENERIC-MMCCAM Sun Oct 7 15:28:50 2018 (r339222) +++ head/sys/amd64/conf/GENERIC-MMCCAM Sun Oct 7 15:54:13 2018 (r339223) @@ -7,7 +7,6 @@ include MINIMAL ident GENERIC-MMCCAM # Access GPT-formatted and labeled root volume -options GEOM_PART_GPT options GEOM_LABEL # UART -- for bhyve console Modified: head/sys/arm64/conf/GENERIC ============================================================================== --- head/sys/arm64/conf/GENERIC Sun Oct 7 15:28:50 2018 (r339222) +++ head/sys/arm64/conf/GENERIC Sun Oct 7 15:54:13 2018 (r339223) @@ -50,7 +50,6 @@ options MSDOSFS # MSDOS Filesystem options CD9660 # ISO 9660 Filesystem options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework -options GEOM_PART_GPT # GUID Partition Tables. options GEOM_RAID # Soft RAID functionality. options GEOM_LABEL # Provides labelization options COMPAT_FREEBSD32 # Incomplete, but used by cloudabi32.ko. Modified: head/sys/i386/conf/GENERIC ============================================================================== --- head/sys/i386/conf/GENERIC Sun Oct 7 15:28:50 2018 (r339222) +++ head/sys/i386/conf/GENERIC Sun Oct 7 15:54:13 2018 (r339223) @@ -51,7 +51,6 @@ options MSDOSFS # MSDOS Filesystem options CD9660 # ISO 9660 Filesystem options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework -options GEOM_PART_GPT # GUID Partition Tables. options GEOM_RAID # Soft RAID functionality. options GEOM_LABEL # Provides labelization options COMPAT_FREEBSD4 # Compatible with FreeBSD4 From owner-svn-src-head@freebsd.org Sun Oct 7 19:50:45 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 98C1B10CAB68; Sun, 7 Oct 2018 19:50:45 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BC23913BE; Sun, 7 Oct 2018 19:50:45 +0000 (UTC) (envelope-from allanjude@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 46E0D186EE; Sun, 7 Oct 2018 19:50:45 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w97Jojca089899; Sun, 7 Oct 2018 19:50:45 GMT (envelope-from allanjude@FreeBSD.org) Received: (from allanjude@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w97JojuH089898; Sun, 7 Oct 2018 19:50:45 GMT (envelope-from allanjude@FreeBSD.org) Message-Id: <201810071950.w97JojuH089898@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: allanjude set sender to allanjude@FreeBSD.org using -f From: Allan Jude Date: Sun, 7 Oct 2018 19:50:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339224 - head/usr.bin/truss X-SVN-Group: head X-SVN-Commit-Author: allanjude X-SVN-Commit-Paths: head/usr.bin/truss X-SVN-Commit-Revision: 339224 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.27 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: Sun, 07 Oct 2018 19:50:45 -0000 Author: allanjude Date: Sun Oct 7 19:50:44 2018 New Revision: 339224 URL: https://svnweb.freebsd.org/changeset/base/339224 Log: Teach truss how to display shm_open(2), shm_unlink(2) Submitted by: Thomas Munro Reviewed by: tuexen, kib Approved by: re (rgrimes) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D17457 Modified: head/usr.bin/truss/syscalls.c Modified: head/usr.bin/truss/syscalls.c ============================================================================== --- head/usr.bin/truss/syscalls.c Sun Oct 7 15:54:13 2018 (r339223) +++ head/usr.bin/truss/syscalls.c Sun Oct 7 19:50:44 2018 (r339224) @@ -461,6 +461,10 @@ static struct syscall decoded_syscalls[] = { { .name = "setsockopt", .ret_type = 1, .nargs = 5, .args = { { Int, 0 }, { Sockoptlevel, 1 }, { Sockoptname, 2 }, { Ptr | IN, 3 }, { Socklent, 4 } } }, + { .name = "shm_open", .ret_type = 1, .nargs = 3, + .args = { { Name | IN, 0 }, { Open, 1 }, { Octal, 2 } } }, + { .name = "shm_unlink", .ret_type = 1, .nargs = 1, + .args = { { Name | IN, 0 } } }, { .name = "shutdown", .ret_type = 1, .nargs = 2, .args = { { Int, 0 }, { Shutdown, 1 } } }, { .name = "sigaction", .ret_type = 1, .nargs = 3, From owner-svn-src-head@freebsd.org Mon Oct 8 01:28:46 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D4C2110AE972; Mon, 8 Oct 2018 01:28:46 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8A5CF73C2E; Mon, 8 Oct 2018 01:28:46 +0000 (UTC) (envelope-from vangyzen@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 811101BCEC; Mon, 8 Oct 2018 01:28:46 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w981SkXG064725; Mon, 8 Oct 2018 01:28:46 GMT (envelope-from vangyzen@FreeBSD.org) Received: (from vangyzen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w981SkAD064724; Mon, 8 Oct 2018 01:28:46 GMT (envelope-from vangyzen@FreeBSD.org) Message-Id: <201810080128.w981SkAD064724@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vangyzen set sender to vangyzen@FreeBSD.org using -f From: Eric van Gyzen Date: Mon, 8 Oct 2018 01:28:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339225 - head/sys/dev/e1000 X-SVN-Group: head X-SVN-Commit-Author: vangyzen X-SVN-Commit-Paths: head/sys/dev/e1000 X-SVN-Commit-Revision: 339225 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.27 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: Mon, 08 Oct 2018 01:28:47 -0000 Author: vangyzen Date: Mon Oct 8 01:28:46 2018 New Revision: 339225 URL: https://svnweb.freebsd.org/changeset/base/339225 Log: em/igb: Do not print link state messages These messages are totally redundant with the iflib messages. They're also not very useful, since they don't include the interface name. Discussed with: shurd Approved by: re (rgrimes) Sponsored by: Dell EMC Isilon Modified: head/sys/dev/e1000/if_em.c Modified: head/sys/dev/e1000/if_em.c ============================================================================== --- head/sys/dev/e1000/if_em.c Sun Oct 7 19:50:44 2018 (r339224) +++ head/sys/dev/e1000/if_em.c Mon Oct 8 01:28:46 2018 (r339225) @@ -1804,13 +1804,11 @@ em_if_update_admin_status(if_ctx_t ctx) } iflib_link_state_change(ctx, LINK_STATE_UP, IF_Mbps(adapter->link_speed)); - printf("Link state changed to up\n"); } else if (!link_check && (adapter->link_active == 1)) { adapter->link_speed = 0; adapter->link_duplex = 0; adapter->link_active = 0; iflib_link_state_change(ctx, LINK_STATE_DOWN, 0); - printf("Link state changed to down\n"); } em_update_stats_counters(adapter); From owner-svn-src-head@freebsd.org Mon Oct 8 14:52:22 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6A84F10C1809; Mon, 8 Oct 2018 14:52:22 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1F8158D613; Mon, 8 Oct 2018 14:52:22 +0000 (UTC) (envelope-from hselasky@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1A5DB240D2; Mon, 8 Oct 2018 14:52:22 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w98EqLSk083290; Mon, 8 Oct 2018 14:52:21 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w98EqLTa083289; Mon, 8 Oct 2018 14:52:21 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201810081452.w98EqLTa083289@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 8 Oct 2018 14:52:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339235 - head/sys/dev/mlx4/mlx4_en X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: head/sys/dev/mlx4/mlx4_en X-SVN-Commit-Revision: 339235 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.27 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: Mon, 08 Oct 2018 14:52:22 -0000 Author: hselasky Date: Mon Oct 8 14:52:21 2018 New Revision: 339235 URL: https://svnweb.freebsd.org/changeset/base/339235 Log: Add missing steering rules for virtual function, VF, in mlx4en(4) driver. When acting as a VF it is required to add steering rules for all unicast addresses. Even if promiscious mode is selected. Else incoming data packets will be dropped. MFC after: 3 days Approved by: re (gjb) Sponsored by: Mellanox Technologies Modified: head/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c Modified: head/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c ============================================================================== --- head/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c Mon Oct 8 08:44:01 2018 (r339234) +++ head/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c Mon Oct 8 14:52:21 2018 (r339235) @@ -905,28 +905,6 @@ static void mlx4_en_do_multicast(struct mlx4_en_priv * priv->flags &= ~MLX4_EN_FLAG_MC_PROMISC; } - /* Update unicast list */ - mlx4_en_cache_uclist(dev); - - update_addr_list_flags(priv, &priv->curr_uc_list, &priv->uc_list); - - list_for_each_entry_safe(addr_list, tmp, &priv->curr_uc_list, list) { - if (addr_list->action == MLX4_ADDR_LIST_REM) { - mlx4_en_uc_steer_release(priv, addr_list->addr, - priv->rss_map.indir_qp.qpn, - addr_list->reg_id); - /* remove from list */ - list_del(&addr_list->list); - kfree(addr_list); - } else if (addr_list->action == MLX4_ADDR_LIST_ADD) { - err = mlx4_en_uc_steer_add(priv, addr_list->addr, - &priv->rss_map.indir_qp.qpn, - &addr_list->reg_id); - if (err) - en_err(priv, "Fail to add unicast address\n"); - } - } - err = mlx4_SET_MCAST_FLTR(mdev->dev, priv->port, 0, 0, MLX4_MCAST_DISABLE); if (err) @@ -996,6 +974,36 @@ static void mlx4_en_do_multicast(struct mlx4_en_priv * } } +static void mlx4_en_do_unicast(struct mlx4_en_priv *priv, + struct net_device *dev, + struct mlx4_en_dev *mdev) +{ + struct mlx4_en_addr_list *addr_list, *tmp; + int err; + + /* Update unicast list */ + mlx4_en_cache_uclist(dev); + + update_addr_list_flags(priv, &priv->curr_uc_list, &priv->uc_list); + + list_for_each_entry_safe(addr_list, tmp, &priv->curr_uc_list, list) { + if (addr_list->action == MLX4_ADDR_LIST_REM) { + mlx4_en_uc_steer_release(priv, addr_list->addr, + priv->rss_map.indir_qp.qpn, + addr_list->reg_id); + /* remove from list */ + list_del(&addr_list->list); + kfree(addr_list); + } else if (addr_list->action == MLX4_ADDR_LIST_ADD) { + err = mlx4_en_uc_steer_add(priv, addr_list->addr, + &priv->rss_map.indir_qp.qpn, + &addr_list->reg_id); + if (err) + en_err(priv, "Fail to add unicast address\n"); + } + } +} + static void mlx4_en_do_set_rx_mode(struct work_struct *work) { struct mlx4_en_priv *priv = container_of(work, struct mlx4_en_priv, @@ -1026,17 +1034,19 @@ static void mlx4_en_do_set_rx_mode(struct work_struct } } + /* Set unicast rules */ + mlx4_en_do_unicast(priv, dev, mdev); + /* Promsicuous mode: disable all filters */ if ((dev->if_flags & IFF_PROMISC) || (priv->flags & MLX4_EN_FLAG_FORCE_PROMISC)) { mlx4_en_set_promisc_mode(priv, mdev); - goto out; + } else if (priv->flags & MLX4_EN_FLAG_PROMISC) { + /* Not in promiscuous mode */ + mlx4_en_clear_promisc_mode(priv, mdev); } - /* Not in promiscuous mode */ - if (priv->flags & MLX4_EN_FLAG_PROMISC) - mlx4_en_clear_promisc_mode(priv, mdev); - + /* Set multicast rules */ mlx4_en_do_multicast(priv, dev, mdev); out: mutex_unlock(&mdev->state_lock); From owner-svn-src-head@freebsd.org Mon Oct 8 15:19:04 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9B45610C26EB; Mon, 8 Oct 2018 15:19:04 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 511EC8EC59; Mon, 8 Oct 2018 15:19:04 +0000 (UTC) (envelope-from mav@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 475FF24429; Mon, 8 Oct 2018 15:19:04 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w98FJ4Uj097206; Mon, 8 Oct 2018 15:19:04 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w98FJ48P097205; Mon, 8 Oct 2018 15:19:04 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201810081519.w98FJ48P097205@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Mon, 8 Oct 2018 15:19:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339237 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: head X-SVN-Commit-Author: mav X-SVN-Commit-Paths: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Commit-Revision: 339237 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.27 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: Mon, 08 Oct 2018 15:19:04 -0000 Author: mav Date: Mon Oct 8 15:19:03 2018 New Revision: 339237 URL: https://svnweb.freebsd.org/changeset/base/339237 Log: Fix r336951 mismerge -- use of uninitialized variable. Reported by: tsoome Approved by: re (gjb) MFC after: 3 days Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c Mon Oct 8 15:16:04 2018 (r339236) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c Mon Oct 8 15:19:03 2018 (r339237) @@ -2964,6 +2964,8 @@ dsl_scan_need_resilver(spa_t *spa, const dva_t *dva, s { vdev_t *vd; + vd = vdev_lookup_top(spa, DVA_GET_VDEV(dva)); + if (vd->vdev_ops == &vdev_indirect_ops) { /* * The indirect vdev can point to multiple @@ -2974,6 +2976,7 @@ dsl_scan_need_resilver(spa_t *spa, const dva_t *dva, s */ return (B_TRUE); } + if (DVA_GET_GANG(dva)) { /* * Gang members may be spread across multiple @@ -2985,8 +2988,6 @@ dsl_scan_need_resilver(spa_t *spa, const dva_t *dva, s */ return (B_TRUE); } - - vd = vdev_lookup_top(spa, DVA_GET_VDEV(dva)); /* * Check if the txg falls within the range which must be From owner-svn-src-head@freebsd.org Mon Oct 8 15:50:24 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9E1D010C3308; Mon, 8 Oct 2018 15:50:24 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mail.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 489B970022; Mon, 8 Oct 2018 15:50:24 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-2.local (ralph.baldwin.cx [66.234.199.215]) by mail.baldwin.cx (Postfix) with ESMTPSA id 9391010B429; Mon, 8 Oct 2018 11:50:21 -0400 (EDT) Subject: Re: svn commit: r339224 - head/usr.bin/truss To: Allan Jude , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201810071950.w97JojuH089898@repo.freebsd.org> From: John Baldwin Message-ID: <586fbf56-6080-fa2a-cdf8-fb9ddf70ea6e@FreeBSD.org> Date: Mon, 8 Oct 2018 08:50:20 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <201810071950.w97JojuH089898@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mail.baldwin.cx); Mon, 08 Oct 2018 11:50:23 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx X-Virus-Status: Clean X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 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: Mon, 08 Oct 2018 15:50:24 -0000 On 10/7/18 12:50 PM, Allan Jude wrote: > Author: allanjude > Date: Sun Oct 7 19:50:44 2018 > New Revision: 339224 > URL: https://svnweb.freebsd.org/changeset/base/339224 > > Log: > Teach truss how to display shm_open(2), shm_unlink(2) > > Submitted by: Thomas Munro > Reviewed by: tuexen, kib > Approved by: re (rgrimes) > MFC after: 2 weeks > Differential Revision: https://reviews.freebsd.org/D17457 You might consider adding a custom handler for shm_open that knows about SHM_ANON. -- John Baldwin                                                                              From owner-svn-src-head@freebsd.org Mon Oct 8 15:52:07 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DBF5F10C35E2; Mon, 8 Oct 2018 15:52:07 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-qt1-x835.google.com (mail-qt1-x835.google.com [IPv6:2607:f8b0:4864:20::835]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8535F704CC; Mon, 8 Oct 2018 15:52:07 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: by mail-qt1-x835.google.com with SMTP id o17-v6so5515927qtr.1; Mon, 08 Oct 2018 08:52:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=p9aXV5s3CDFu6fWehMFXa9tAZBCQyIj4/R2fxnvfxZI=; b=YlHpcNurEDjinsQHlFtVIxiybZM58Oeyhqu8URMUXkQREgsVDuYnS+c5h/1CtNF2Xi ys9CpaH3UCmkoKpExfOQxmPLykpYl1m1rrTlSbeZRQaG1i+dKnN8jTFu1V87KfPwrLL3 l/eCNftDzYKMKxBeJDoDL2MWudqBNavITgMCKVJqUM4mQ2rX92a4tlKFj8+MPu15Gdlm A7as7GD089RF1br6zYl/p1bssdRYe64w0p+i9gpqcHwonPidTpz8w02i52C+gqypQU/d lmkVrVUyO4Gnynnkwk9/1QqeQOZzfp1BhqyKet8qBMkeuqNWPtLi4hPJ6Bzv3zCAWYMD yvGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=p9aXV5s3CDFu6fWehMFXa9tAZBCQyIj4/R2fxnvfxZI=; b=DSRikznH8dWBvgmZYsfz26ZRyL2XPnBZyzllzzLcSnYES7vVhsZjk4VTNsgT37sa0u 8V2ViXIijCvspUVDedjscRtRLxu/emjXLZ7xiRth59Oi8cZf4qSogooBgN62gQxCHQ2N jhOTUd4cwHzu8YauBJxHe6wcA4XcJwmrCxN/RG4FKiLVrqmauIFwrFx1Or+I2GZ06Y0r o6Q1gTzGBUerX0Z3syJ/V/QBSDZWGQr9RWLnqqkVCq/ZuWf6X00iptsDDWQnYaJen+QX TaxnD69IMEQUeRe62sg6iycnaFEOCHh0WGAAMFeDnFeNdb+MH6ksSDEsMZNfwt53nOi+ i9oQ== X-Gm-Message-State: ABuFfohU+VXIhWQyVT6sOlGLMDvaLQ0XHWWu3pF0/vvDSINTvLaCcYaN hhpRk3UKj+2Psvj1lRhjOLzIA36xEuuAgq9kZC2lCw== X-Google-Smtp-Source: ACcGV62JBsywWaCQkfgl0rvF4Fg6g1iBeuP3hCFlHiX0//oWpI+kRlzYBNaLXY46QpUaB1YRWbaCHJp4itsb8BhSuMc= X-Received: by 2002:aed:3031:: with SMTP id 46-v6mr19589043qte.29.1539013926960; Mon, 08 Oct 2018 08:52:06 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:ac8:362e:0:0:0:0:0 with HTTP; Mon, 8 Oct 2018 08:52:06 -0700 (PDT) In-Reply-To: <586fbf56-6080-fa2a-cdf8-fb9ddf70ea6e@FreeBSD.org> References: <201810071950.w97JojuH089898@repo.freebsd.org> <586fbf56-6080-fa2a-cdf8-fb9ddf70ea6e@FreeBSD.org> From: Mateusz Guzik Date: Mon, 8 Oct 2018 17:52:06 +0200 Message-ID: Subject: Re: svn commit: r339224 - head/usr.bin/truss To: John Baldwin Cc: Allan Jude , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 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: Mon, 08 Oct 2018 15:52:08 -0000 On 10/8/18, John Baldwin wrote: > On 10/7/18 12:50 PM, Allan Jude wrote: >> Author: allanjude >> Date: Sun Oct 7 19:50:44 2018 >> New Revision: 339224 >> URL: https://svnweb.freebsd.org/changeset/base/339224 >> >> Log: >> Teach truss how to display shm_open(2), shm_unlink(2) >> >> Submitted by: Thomas Munro >> Reviewed by: tuexen, kib >> Approved by: re (rgrimes) >> MFC after: 2 weeks >> Differential Revision: https://reviews.freebsd.org/D17457 > > You might consider adding a custom handler for shm_open that knows about > SHM_ANON. > see https://reviews.freebsd.org/D17461 -- Mateusz Guzik From owner-svn-src-head@freebsd.org Mon Oct 8 16:46:55 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 16B5210C4812; Mon, 8 Oct 2018 16:46:55 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mail.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B54B571E9C; Mon, 8 Oct 2018 16:46:54 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-2.local (ralph.baldwin.cx [66.234.199.215]) by mail.baldwin.cx (Postfix) with ESMTPSA id 4C9A910B4CE; Mon, 8 Oct 2018 12:46:52 -0400 (EDT) Subject: Re: svn commit: r264378 - head/sys/geom/part To: Marcel Moolenaar , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201404122028.s3CKSdo1026394@svn.freebsd.org> Cc: Josh Paetzel From: John Baldwin Message-ID: Date: Mon, 8 Oct 2018 09:46:50 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <201404122028.s3CKSdo1026394@svn.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mail.baldwin.cx); Mon, 08 Oct 2018 12:46:53 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx X-Virus-Status: Clean X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 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: Mon, 08 Oct 2018 16:46:55 -0000 On 4/12/14 1:28 PM, Marcel Moolenaar wrote: > Author: marcel > Date: Sat Apr 12 20:28:39 2014 > New Revision: 264378 > URL: http://svnweb.freebsd.org/changeset/base/264378 > > Log: > Align and round the partitionable disk space to 4K by default. > Since this would also apply when recovering, make sure not to > align or round when that would have a partition fall outside > the partitionable area. This needs a way to be overridden. If you have a machine installed with a layout created prior to this change (e.g. a zpool mirror or RAID or some other mirror or RAID), you can no longer create a matching partition since the starting sector is now always 40 instead of 34 and the partition size won't match. Also, while we may want to create sane layouts by default, we should probably always provide a way to create less-sane layouts that are still conformant to the spec. I do wonder if this kind of default preference shouldn't belong in the userspace gpart tool rather than the kernel and the kernel should create any compliant layout as requested by userland instead. jpaetzel@ just ran into this case where he can't replace a failed disk in a system running 12 that was first formatted on 10, so it's not academic. -- John Baldwin                                                                              From owner-svn-src-head@freebsd.org Mon Oct 8 17:33:11 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 41A6510C5E42; Mon, 8 Oct 2018 17:33:11 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Received: from phk.freebsd.dk (phk.freebsd.dk [130.225.244.222]) by mx1.freebsd.org (Postfix) with ESMTP id C1D4873CA7; Mon, 8 Oct 2018 17:33:10 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Received: from critter.freebsd.dk (unknown [192.168.55.3]) by phk.freebsd.dk (Postfix) with ESMTP id 7C8A41487A; Mon, 8 Oct 2018 17:33:04 +0000 (UTC) Received: from critter.freebsd.dk (localhost [127.0.0.1]) by critter.freebsd.dk (8.15.2/8.15.2) with ESMTPS id w98HX4WF026143 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 8 Oct 2018 17:33:04 GMT (envelope-from phk@critter.freebsd.dk) Received: (from phk@localhost) by critter.freebsd.dk (8.15.2/8.15.2/Submit) id w98HX3CR026142; Mon, 8 Oct 2018 17:33:03 GMT (envelope-from phk) To: John Baldwin cc: Marcel Moolenaar , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org, Josh Paetzel Subject: Re: svn commit: r264378 - head/sys/geom/part In-reply-to: From: "Poul-Henning Kamp" References: <201404122028.s3CKSdo1026394@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <26140.1539019983.1@critter.freebsd.dk> Content-Transfer-Encoding: quoted-printable Date: Mon, 08 Oct 2018 17:33:03 +0000 Message-ID: <26141.1539019983@critter.freebsd.dk> X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 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: Mon, 08 Oct 2018 17:33:11 -0000 -------- In message , John Baldwi= n writes: >On 4/12/14 1:28 PM, Marcel Moolenaar wrote: >Also, while we may want to create sane layouts by default, we >should probably always provide a way to create less-sane layouts that are >still conformant to the spec. I do wonder if this kind of default >preference shouldn't belong in the userspace gpart tool rather than the >kernel and the kernel should create any compliant layout as requested by >userland instead. Seconded. -- = Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe = Never attribute to malice what can adequately be explained by incompetence= . From owner-svn-src-head@freebsd.org Mon Oct 8 18:45:41 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CB82710C7B28; Mon, 8 Oct 2018 18:45:41 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8229276AFD; Mon, 8 Oct 2018 18:45:41 +0000 (UTC) (envelope-from kib@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 790C2266EC; Mon, 8 Oct 2018 18:45:41 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w98IjfeS005216; Mon, 8 Oct 2018 18:45:41 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w98IjfKc005215; Mon, 8 Oct 2018 18:45:41 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201810081845.w98IjfKc005215@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Mon, 8 Oct 2018 18:45:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339241 - head/lib/libc/stdtime X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/lib/libc/stdtime X-SVN-Commit-Revision: 339241 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.27 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: Mon, 08 Oct 2018 18:45:42 -0000 Author: kib Date: Mon Oct 8 18:45:40 2018 New Revision: 339241 URL: https://svnweb.freebsd.org/changeset/base/339241 Log: Disallow zero day of month from strptime("%d"). It is required by POSIX, specified in our man page, and followed by Linux. PR: 232072 Reported by: miguel_tete17@hotmail.com Sponsored by: The FreeBSD Foundation Approved by: re (gjb) MFC after: 1 week Modified: head/lib/libc/stdtime/strptime.c Modified: head/lib/libc/stdtime/strptime.c ============================================================================== --- head/lib/libc/stdtime/strptime.c Mon Oct 8 18:06:40 2018 (r339240) +++ head/lib/libc/stdtime/strptime.c Mon Oct 8 18:45:40 2018 (r339241) @@ -419,7 +419,7 @@ label: i += *buf - '0'; len--; } - if (i > 31) + if (i == 0 || i > 31) return (NULL); tm->tm_mday = i; From owner-svn-src-head@freebsd.org Mon Oct 8 19:15:59 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C46DA10C8BA4; Mon, 8 Oct 2018 19:15:59 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7A34F785D5; Mon, 8 Oct 2018 19:15:59 +0000 (UTC) (envelope-from jhb@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7488526BF2; Mon, 8 Oct 2018 19:15:59 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w98JFxrV020738; Mon, 8 Oct 2018 19:15:59 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w98JFxDi020737; Mon, 8 Oct 2018 19:15:59 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201810081915.w98JFxDi020737@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Mon, 8 Oct 2018 19:15:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339242 - head/usr.sbin/kldxref X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/usr.sbin/kldxref X-SVN-Commit-Revision: 339242 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.27 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: Mon, 08 Oct 2018 19:16:00 -0000 Author: jhb Date: Mon Oct 8 19:15:58 2018 New Revision: 339242 URL: https://svnweb.freebsd.org/changeset/base/339242 Log: Add support for relocations in RISC-V kernel modules to kldxref. Reviewed by: br, markj Approved by: re (gjb) Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D17415 Added: head/usr.sbin/kldxref/ef_riscv.c (contents, props changed) Added: head/usr.sbin/kldxref/ef_riscv.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.sbin/kldxref/ef_riscv.c Mon Oct 8 19:15:58 2018 (r339242) @@ -0,0 +1,78 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2018 John Baldwin + * + * This software was developed by SRI International and the University of + * Cambridge Computer Laboratory (Department of Computer Science and + * Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the + * DARPA SSITH research programme. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include + +#include +#include + +#include "ef.h" + +int +ef_reloc(struct elf_file *ef, const void *reldata, int reltype, Elf_Off relbase, + Elf_Off dataoff, size_t len, void *dest) +{ + Elf_Addr *where, val; + const Elf_Rela *rela; + Elf_Addr addend, addr; + Elf_Size rtype; + + switch (reltype) { + case EF_RELOC_RELA: + rela = (const Elf_Rela *)reldata; + where = (Elf_Addr *)((char *)dest + relbase + rela->r_offset - + dataoff); + addend = rela->r_addend; + rtype = ELF_R_TYPE(rela->r_info); + break; + default: + return (EINVAL); + } + + if ((char *)where < (char *)dest || (char *)where >= (char *)dest + len) + return (0); + + switch (rtype) { + case R_RISCV_RELATIVE: /* B + A */ + addr = addend + relbase; + val = addr; + *where = val; + break; + default: + warnx("unhandled relocation type %d", (int)rtype); + } + return (0); +} From owner-svn-src-head@freebsd.org Mon Oct 8 19:19:49 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 68E2E10C8DDA; Mon, 8 Oct 2018 19:19:49 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 9978078D5A; Mon, 8 Oct 2018 19:19:48 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.125.17]) by shaw.ca with ESMTPA id 9b4BgZsKqp5A19b4CgahFT; Mon, 08 Oct 2018 13:19:46 -0600 X-Authority-Analysis: v=2.3 cv=JLKPTPCb c=1 sm=1 tr=0 a=VFtTW3WuZNDh6VkGe7fA3g==:117 a=VFtTW3WuZNDh6VkGe7fA3g==:17 a=smKx5t2vBNcA:10 a=YxBL1-UpAAAA:8 a=6I5d2MoRAAAA:8 a=hZ-2a-0vA5wY28zHTQIA:9 a=JR_RXYbbyyRHRfNm:21 a=IXoyP02WJibMEKM6:21 a=CjuIK1q_8ugA:10 a=OLWWZBwWKZSQE7p8:21 a=G0zW8GfkrI0K_Atp:21 a=k94tJbj3Gm0WKJ8G:21 a=_W_S_7VecoQA:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=IjZwj45LgO3ly-622nXo:22 Received: from [25.82.157.51] (unknown [24.114.25.133]) by spqr.komquats.com (Postfix) with ESMTPSA id 6C4281D8A0; Mon, 8 Oct 2018 12:19:40 -0700 (PDT) MIME-Version: 1.0 From: Cy Schubert Subject: RE: svn commit: r264378 - head/sys/geom/part Date: Mon, 8 Oct 2018 13:19:44 -0600 To: Poul-Henning Kamp , John Baldwin CC: Marcel Moolenaar , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" , Josh Paetzel Message-Id: <20181008191940.6C4281D8A0@spqr.komquats.com> X-CMAE-Envelope: MS4wfEueKOpkeahm61z7sr421XLiSSfPAY2IDUV0p+Om7rFo62tQnkHRsJsVL30KABcoyz4t5yLp1xajRDQAohEmlqal3G/QZHDhEej7iPn4hCj82VCUbtwh xvXgkblGWJFY1YKqraHKULGLo1Zb2A7seWBowCuk4RgEcBmkehkB0M0AUZCalRXwp29++rXh629vHtyi+X4DHdRqIq5KqSqJcO+6+8Shgm+qf4itbXC2NMh7 eqbyG7y4u3fH5+xyXMYCMf1hX3VSfBCoXY9sd78lJKle4JfKKTDAHRJ0/3in4ro5cDLIR4i2/BfvrnYjtmeDQmdJ64CaGjWYF182MwnyX0gfh58rzkc2Qz+R t/kXf9v5 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.27 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 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: Mon, 08 Oct 2018 19:19:49 -0000 +1 --- Sent using a tiny phone keyboard. Apologies for any typos and autocorrect. Also, this old phone only supports top post. Apologies. Cy Schubert or The need of the many outweighs the greed of the few. --- -----Original Message----- From: Poul-Henning Kamp Sent: 08/10/2018 11:33 To: John Baldwin Cc: Marcel Moolenaar; src-committers@freebsd.org; svn-src-all@freebsd.org; = svn-src-head@freebsd.org; Josh Paetzel Subject: Re: svn commit: r264378 - head/sys/geom/part -------- In message , John Baldwin= writes: >On 4/12/14 1:28 PM, Marcel Moolenaar wrote: >Also, while we may want to create sane layouts by default, we >should probably always provide a way to create less-sane layouts that are >still conformant to the spec. I do wonder if this kind of default >preference shouldn't belong in the userspace gpart tool rather than the >kernel and the kernel should create any compliant layout as requested by >userland instead. Seconded. --=20 Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe =20 Never attribute to malice what can adequately be explained by incompetence. From owner-svn-src-head@freebsd.org Mon Oct 8 19:48:59 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 57E3010C99AE; Mon, 8 Oct 2018 19:48:59 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 041B27A46F; Mon, 8 Oct 2018 19:48:59 +0000 (UTC) (envelope-from gjb@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F1A2A2712B; Mon, 8 Oct 2018 19:48:58 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w98JmwUg036687; Mon, 8 Oct 2018 19:48:58 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w98JmwY7036686; Mon, 8 Oct 2018 19:48:58 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201810081948.w98JmwY7036686@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 8 Oct 2018 19:48:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339244 - head/usr.sbin/bsdinstall/scripts X-SVN-Group: head X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: head/usr.sbin/bsdinstall/scripts X-SVN-Commit-Revision: 339244 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.27 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: Mon, 08 Oct 2018 19:48:59 -0000 Author: gjb Date: Mon Oct 8 19:48:58 2018 New Revision: 339244 URL: https://svnweb.freebsd.org/changeset/base/339244 Log: Fix the distribution path for -ALPHA builds, which are under the snapshots directory, not releases. Reported by: David Marec david.marec _at_ davenulle _dot_ org Approved by: re (rgrimes) Sponsored by: The FreeBSD Foundation Modified: head/usr.sbin/bsdinstall/scripts/mirrorselect Modified: head/usr.sbin/bsdinstall/scripts/mirrorselect ============================================================================== --- head/usr.sbin/bsdinstall/scripts/mirrorselect Mon Oct 8 19:39:05 2018 (r339243) +++ head/usr.sbin/bsdinstall/scripts/mirrorselect Mon Oct 8 19:48:58 2018 (r339244) @@ -161,7 +161,7 @@ _UNAME_R=`uname -r` _UNAME_R=${_UNAME_R%-p*} case ${_UNAME_R} in - *-CURRENT|*-STABLE|*-PRERELEASE) + *-ALPHA*|*-CURRENT|*-STABLE|*-PRERELEASE) RELDIR="snapshots" ;; *) From owner-svn-src-head@freebsd.org Mon Oct 8 23:23:10 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3FF5C10CEF68; Mon, 8 Oct 2018 23:23:10 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EAAF084C0A; Mon, 8 Oct 2018 23:23:09 +0000 (UTC) (envelope-from jhb@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E5C9515CE; Mon, 8 Oct 2018 23:23:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w98NN9Cm050335; Mon, 8 Oct 2018 23:23:09 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w98NN9xL050334; Mon, 8 Oct 2018 23:23:09 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201810082323.w98NN9xL050334@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Mon, 8 Oct 2018 23:23:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339246 - head/contrib/dma X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/contrib/dma X-SVN-Commit-Revision: 339246 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.27 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: Mon, 08 Oct 2018 23:23:10 -0000 Author: jhb Date: Mon Oct 8 23:23:09 2018 New Revision: 339246 URL: https://svnweb.freebsd.org/changeset/base/339246 Log: crypto: Don't limit to TLSv1 only Approved by: re (rgrimes, gjb) Obtained from: upstream commit e94f50bbbe7318eec5b6b165ff73d94bbc9d20b0 Modified: head/contrib/dma/crypto.c Modified: head/contrib/dma/crypto.c ============================================================================== --- head/contrib/dma/crypto.c Mon Oct 8 22:38:28 2018 (r339245) +++ head/contrib/dma/crypto.c Mon Oct 8 23:23:09 2018 (r339246) @@ -93,7 +93,12 @@ smtp_init_crypto(int fd, int feature) SSL_library_init(); SSL_load_error_strings(); - meth = TLSv1_client_method(); + // Allow any possible version +#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) + meth = TLS_client_method(); +#else + meth = SSLv23_client_method(); +#endif ctx = SSL_CTX_new(meth); if (ctx == NULL) { From owner-svn-src-head@freebsd.org Tue Oct 9 01:10:50 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B772D10AD8B0; Tue, 9 Oct 2018 01:10:50 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8A87B896BD; Tue, 9 Oct 2018 01:10:50 +0000 (UTC) (envelope-from rmacklem@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 859572717; Tue, 9 Oct 2018 01:10:50 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w991Ao43003007; Tue, 9 Oct 2018 01:10:50 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w991Aoip003006; Tue, 9 Oct 2018 01:10:50 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201810090110.w991Aoip003006@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Tue, 9 Oct 2018 01:10:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339247 - head/sys/fs/nfsserver X-SVN-Group: head X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: head/sys/fs/nfsserver X-SVN-Commit-Revision: 339247 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.27 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: Tue, 09 Oct 2018 01:10:51 -0000 Author: rmacklem Date: Tue Oct 9 01:10:50 2018 New Revision: 339247 URL: https://svnweb.freebsd.org/changeset/base/339247 Log: Fix the pNFS server's reporting of disk space usage for the "#" case. The pNFS server would report the total disk space used and free for all of the DSs, even when certain DSs are assigned to the file system via the "#" suffix used in the "nfsd -p" option argument. This patch fixes this case. It only reports usage for the file system that the argument vnode resides on. This is consistent with the non-pNFS NFSv4 server. In NFSv4 it is possible to have subtrees on other file systems, but these are not included in the usage information for NFSv4. Approved by: re (gjb) Modified: head/sys/fs/nfsserver/nfs_nfsdport.c Modified: head/sys/fs/nfsserver/nfs_nfsdport.c ============================================================================== --- head/sys/fs/nfsserver/nfs_nfsdport.c Mon Oct 8 23:23:09 2018 (r339246) +++ head/sys/fs/nfsserver/nfs_nfsdport.c Tue Oct 9 01:10:50 2018 (r339247) @@ -133,7 +133,7 @@ static void nfsrv_pnfssetfh(struct vnode *, struct pnf static int nfsrv_dsremove(struct vnode *, char *, struct ucred *, NFSPROC_T *); static int nfsrv_dssetacl(struct vnode *, struct acl *, struct ucred *, NFSPROC_T *); -static int nfsrv_pnfsstatfs(struct statfs *); +static int nfsrv_pnfsstatfs(struct statfs *, struct mount *); int nfs_pnfsio(task_fn_t *, void *); @@ -1593,7 +1593,7 @@ nfsvno_statfs(struct vnode *vp, struct statfs *sf) if (nfsrv_devidcnt > 0) { /* For a pNFS service, get the DS numbers. */ tsf = malloc(sizeof(*tsf), M_TEMP, M_WAITOK | M_ZERO); - error = nfsrv_pnfsstatfs(tsf); + error = nfsrv_pnfsstatfs(tsf, vp->v_mount); if (error != 0) { free(tsf, M_TEMP); tsf = NULL; @@ -1774,7 +1774,7 @@ nfsvno_fillattr(struct nfsrv_descript *nd, struct moun NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_SPACEFREE) || NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_SPACETOTAL))) { sf = malloc(sizeof(*sf), M_TEMP, M_WAITOK | M_ZERO); - error = nfsrv_pnfsstatfs(sf); + error = nfsrv_pnfsstatfs(sf, mp); if (error != 0) { free(sf, M_TEMP); sf = NULL; @@ -5578,7 +5578,7 @@ nfsrv_killrpcs(struct nfsmount *nmp) * receive the total for all DSs. */ static int -nfsrv_pnfsstatfs(struct statfs *sf) +nfsrv_pnfsstatfs(struct statfs *sf, struct mount *mp) { struct statfs *tsf; struct nfsdevice *ds; @@ -5595,11 +5595,28 @@ nfsrv_pnfsstatfs(struct statfs *sf) tdvpp = dvpp; i = 0; NFSDDSLOCK(); + /* First, search for matches for same file system. */ TAILQ_FOREACH(ds, &nfsrv_devidhead, nfsdev_list) { - if (ds->nfsdev_nmp != NULL) { + if (ds->nfsdev_nmp != NULL && ds->nfsdev_mdsisset != 0 && + ds->nfsdev_mdsfsid.val[0] == mp->mnt_stat.f_fsid.val[0] && + ds->nfsdev_mdsfsid.val[1] == mp->mnt_stat.f_fsid.val[1]) { if (++i > nfsrv_devidcnt) break; *tdvpp++ = ds->nfsdev_dvp; + } + } + /* + * If no matches for same file system, total all servers not assigned + * to a file system. + */ + if (i == 0) { + TAILQ_FOREACH(ds, &nfsrv_devidhead, nfsdev_list) { + if (ds->nfsdev_nmp != NULL && + ds->nfsdev_mdsisset == 0) { + if (++i > nfsrv_devidcnt) + break; + *tdvpp++ = ds->nfsdev_dvp; + } } } NFSDDSUNLOCK(); From owner-svn-src-head@freebsd.org Tue Oct 9 03:12:00 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B2C9610BAE6B; Tue, 9 Oct 2018 03:12:00 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 65BFA711D9; Tue, 9 Oct 2018 03:12:00 +0000 (UTC) (envelope-from emaste@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 609C2454E; Tue, 9 Oct 2018 03:12:00 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w993C0TE069841; Tue, 9 Oct 2018 03:12:00 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w993C0Lg069838; Tue, 9 Oct 2018 03:12:00 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201810090312.w993C0Lg069838@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 9 Oct 2018 03:12:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339248 - head/crypto/openssh X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/crypto/openssh X-SVN-Commit-Revision: 339248 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.27 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: Tue, 09 Oct 2018 03:12:00 -0000 Author: emaste Date: Tue Oct 9 03:11:59 2018 New Revision: 339248 URL: https://svnweb.freebsd.org/changeset/base/339248 Log: openssh: regenerate ssh-namespace.h after r339213 and r339216 Reported by: des Approved by: re (rgrimes) Modified: head/crypto/openssh/ssh_namespace.h Modified: head/crypto/openssh/ssh_namespace.h ============================================================================== --- head/crypto/openssh/ssh_namespace.h Tue Oct 9 01:10:50 2018 (r339247) +++ head/crypto/openssh/ssh_namespace.h Tue Oct 9 03:11:59 2018 (r339248) @@ -8,6 +8,37 @@ #define Blowfish_expandstate Fssh_Blowfish_expandstate #define Blowfish_initstate Fssh_Blowfish_initstate #define Blowfish_stream2word Fssh_Blowfish_stream2word +#define DH_get0_key Fssh_DH_get0_key +#define DH_get0_pqg Fssh_DH_get0_pqg +#define DH_set0_key Fssh_DH_set0_key +#define DH_set0_pqg Fssh_DH_set0_pqg +#define DH_set_length Fssh_DH_set_length +#define DSA_SIG_get0 Fssh_DSA_SIG_get0 +#define DSA_SIG_set0 Fssh_DSA_SIG_set0 +#define DSA_get0_key Fssh_DSA_get0_key +#define DSA_get0_pqg Fssh_DSA_get0_pqg +#define DSA_set0_key Fssh_DSA_set0_key +#define DSA_set0_pqg Fssh_DSA_set0_pqg +#define ECDSA_SIG_get0 Fssh_ECDSA_SIG_get0 +#define ECDSA_SIG_set0 Fssh_ECDSA_SIG_set0 +#define EVP_CIPHER_CTX_get_iv Fssh_EVP_CIPHER_CTX_get_iv +#define EVP_CIPHER_CTX_set_iv Fssh_EVP_CIPHER_CTX_set_iv +#define EVP_MD_CTX_free Fssh_EVP_MD_CTX_free +#define EVP_MD_CTX_new Fssh_EVP_MD_CTX_new +#define EVP_PKEY_get0_RSA Fssh_EVP_PKEY_get0_RSA +#define RSA_get0_crt_params Fssh_RSA_get0_crt_params +#define RSA_get0_factors Fssh_RSA_get0_factors +#define RSA_get0_key Fssh_RSA_get0_key +#define RSA_meth_dup Fssh_RSA_meth_dup +#define RSA_meth_free Fssh_RSA_meth_free +#define RSA_meth_get_finish Fssh_RSA_meth_get_finish +#define RSA_meth_set1_name Fssh_RSA_meth_set1_name +#define RSA_meth_set_finish Fssh_RSA_meth_set_finish +#define RSA_meth_set_priv_dec Fssh_RSA_meth_set_priv_dec +#define RSA_meth_set_priv_enc Fssh_RSA_meth_set_priv_enc +#define RSA_set0_crt_params Fssh_RSA_set0_crt_params +#define RSA_set0_factors Fssh_RSA_set0_factors +#define RSA_set0_key Fssh_RSA_set0_key #define _ssh__compat_glob Fssh__ssh__compat_glob #define _ssh__compat_globfree Fssh__ssh__compat_globfree #define _ssh_compat_realpath Fssh__ssh_compat_realpath @@ -166,7 +197,6 @@ #define cipher_crypt Fssh_cipher_crypt #define cipher_ctx_is_plaintext Fssh_cipher_ctx_is_plaintext #define cipher_free Fssh_cipher_free -#define cipher_get_keycontext Fssh_cipher_get_keycontext #define cipher_get_keyiv Fssh_cipher_get_keyiv #define cipher_get_keyiv_len Fssh_cipher_get_keyiv_len #define cipher_get_length Fssh_cipher_get_length @@ -175,7 +205,6 @@ #define cipher_ivlen Fssh_cipher_ivlen #define cipher_keylen Fssh_cipher_keylen #define cipher_seclen Fssh_cipher_seclen -#define cipher_set_keycontext Fssh_cipher_set_keycontext #define cipher_set_keyiv Fssh_cipher_set_keyiv #define cipher_warning_message Fssh_cipher_warning_message #define ciphers_valid Fssh_ciphers_valid @@ -630,7 +659,7 @@ #define ssh_remove_all_identities Fssh_ssh_remove_all_identities #define ssh_remove_identity Fssh_ssh_remove_identity #define ssh_request_reply Fssh_ssh_request_reply -#define ssh_rsa_generate_additional_parameters Fssh_ssh_rsa_generate_additional_parameters +#define ssh_rsa_complete_crt_parameters Fssh_ssh_rsa_complete_crt_parameters #define ssh_rsa_sign Fssh_ssh_rsa_sign #define ssh_rsa_verify Fssh_ssh_rsa_verify #define ssh_set_app_data Fssh_ssh_set_app_data @@ -652,6 +681,7 @@ #define sshbuf_dump_data Fssh_sshbuf_dump_data #define sshbuf_dup_string Fssh_sshbuf_dup_string #define sshbuf_free Fssh_sshbuf_free +#define sshbuf_free_passwd Fssh_sshbuf_free_passwd #define sshbuf_from Fssh_sshbuf_from #define sshbuf_fromb Fssh_sshbuf_fromb #define sshbuf_froms Fssh_sshbuf_froms @@ -662,6 +692,7 @@ #define sshbuf_get_cstring Fssh_sshbuf_get_cstring #define sshbuf_get_ec Fssh_sshbuf_get_ec #define sshbuf_get_eckey Fssh_sshbuf_get_eckey +#define sshbuf_get_passwd Fssh_sshbuf_get_passwd #define sshbuf_get_string Fssh_sshbuf_get_string #define sshbuf_get_string_direct Fssh_sshbuf_get_string_direct #define sshbuf_get_stringb Fssh_sshbuf_get_stringb @@ -683,6 +714,7 @@ #define sshbuf_put_cstring Fssh_sshbuf_put_cstring #define sshbuf_put_ec Fssh_sshbuf_put_ec #define sshbuf_put_eckey Fssh_sshbuf_put_eckey +#define sshbuf_put_passwd Fssh_sshbuf_put_passwd #define sshbuf_put_string Fssh_sshbuf_put_string #define sshbuf_put_stringb Fssh_sshbuf_put_stringb #define sshbuf_put_u16 Fssh_sshbuf_put_u16 @@ -697,7 +729,6 @@ #define sshbuf_reset Fssh_sshbuf_reset #define sshbuf_set_max_size Fssh_sshbuf_set_max_size #define sshbuf_set_parent Fssh_sshbuf_set_parent -#define sshkey_add_private Fssh_sshkey_add_private #define sshkey_alg_list Fssh_sshkey_alg_list #define sshkey_cert_check_authority Fssh_sshkey_cert_check_authority #define sshkey_cert_copy Fssh_sshkey_cert_copy @@ -709,7 +740,6 @@ #define sshkey_curve_name_to_nid Fssh_sshkey_curve_name_to_nid #define sshkey_curve_nid_to_bits Fssh_sshkey_curve_nid_to_bits #define sshkey_curve_nid_to_name Fssh_sshkey_curve_nid_to_name -#define sshkey_demote Fssh_sshkey_demote #define sshkey_drop_cert Fssh_sshkey_drop_cert #define sshkey_dump_ec_key Fssh_sshkey_dump_ec_key #define sshkey_dump_ec_point Fssh_sshkey_dump_ec_point From owner-svn-src-head@freebsd.org Tue Oct 9 07:22:16 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0723310C33DD; Tue, 9 Oct 2018 07:22:16 +0000 (UTC) (envelope-from egypcio@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B1CD47A2AC; Tue, 9 Oct 2018 07:22:15 +0000 (UTC) (envelope-from egypcio@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9448D6F2C; Tue, 9 Oct 2018 07:22:15 +0000 (UTC) (envelope-from egypcio@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w997MFfs098130; Tue, 9 Oct 2018 07:22:15 GMT (envelope-from egypcio@FreeBSD.org) Received: (from egypcio@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w997MFP2098129; Tue, 9 Oct 2018 07:22:15 GMT (envelope-from egypcio@FreeBSD.org) Message-Id: <201810090722.w997MFP2098129@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: egypcio set sender to egypcio@FreeBSD.org using -f From: =?UTF-8?Q?Vin=c3=adcius_Zavam?= Date: Tue, 9 Oct 2018 07:22:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339249 - in head: share/misc usr.bin/calendar/calendars X-SVN-Group: head X-SVN-Commit-Author: egypcio X-SVN-Commit-Paths: in head: share/misc usr.bin/calendar/calendars X-SVN-Commit-Revision: 339249 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.27 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: Tue, 09 Oct 2018 07:22:16 -0000 Author: egypcio (ports committer) Date: Tue Oct 9 07:22:14 2018 New Revision: 339249 URL: https://svnweb.freebsd.org/changeset/base/339249 Log: following "Setup, Conventions, and Traditions" (Committer's Guide); 5. share/misc/committers-ports.dot * reflecting my privileges only for ports/, with mentors' entries; * did test it with dot (graphics/graphviz) to check accent support. 9. usr.bin/calendar/calendars/calendar.freebsd * added birth date + place. 'calendar.freebsd' offers UTF-8, so I added my entry using proper accents. Reviewed by: rene (mentor) Approved by: re (gjb), araujo (mentor), beat (mentor) Differential Revision: https://reviews.freebsd.org/D17469 Modified: head/share/misc/committers-ports.dot head/usr.bin/calendar/calendars/calendar.freebsd Modified: head/share/misc/committers-ports.dot ============================================================================== --- head/share/misc/committers-ports.dot Tue Oct 9 03:11:59 2018 (r339248) +++ head/share/misc/committers-ports.dot Tue Oct 9 07:22:14 2018 (r339249) @@ -100,6 +100,7 @@ dumbbell [label="Jean-Sebastien Pedron\ndumbbell@FreeB dvl [label="Dan Langille\ndvl@FreeBSD.org\n2014/08/10"] eadler [label="Eitan Adler\neadler@FreeBSD.org\n2011/08/17"] edwin [label="Edwin Groothuis\nedwin@FreeBSD.org\n2002/10/22"] +egypcio [label="Vinícius Zavam\negypcio@FreeBSD.org\n2018/10/04"] ehaupt [label="Emanuel Haupt\nehaupt@FreeBSD.org\n2005/10/03"] eik [label="Oliver Eikemeier\neik@FreeBSD.org\n2003/11/12"] ericbsd [label="Eric Turgeon\nericbsd@FreeBSD.org\n2018/03/17"] @@ -297,6 +298,7 @@ amdmi3 -> arrowd antoine -> dumbbell +araujo -> egypcio araujo -> jhixson araujo -> lippe araujo -> pclin @@ -332,6 +334,7 @@ bapt -> rpaulo bapt -> sbruno beat -> decke +beat -> egypcio beat -> marius beat -> sperber beat -> uqs @@ -633,6 +636,7 @@ rakuco -> tcberner rene -> bar rene -> cmt rene -> crees +rene -> egypcio rene -> jgh rene -> jmd rene -> joneum Modified: head/usr.bin/calendar/calendars/calendar.freebsd ============================================================================== --- head/usr.bin/calendar/calendars/calendar.freebsd Tue Oct 9 03:11:59 2018 (r339248) +++ head/usr.bin/calendar/calendars/calendar.freebsd Tue Oct 9 07:22:14 2018 (r339249) @@ -85,6 +85,7 @@ 02/22 Jake Burkholder born in Maynooth, Ontario, Canada, 1979 02/23 Peter Wemm born in Perth, Western Australia, Australia, 1971 02/23 Mathieu Arnold born in Champigny sur Marne, Val de Marne, France, 1978 +02/23 Vinícius Zavam born in Fortaleza, Ceará, Brazil, 1986 02/24 Johan Karlsson born in Mariannelund, Sweden, 1974 02/24 Colin Percival born in Burnaby, Canada, 1981 02/24 Kevin Bowling born in Scottsdale, Arizona, United States, 1989 From owner-svn-src-head@freebsd.org Tue Oct 9 08:41:24 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CF6E910C5BAE; Tue, 9 Oct 2018 08:41:24 +0000 (UTC) (envelope-from bu7cher@yandex.ru) Received: from forward101o.mail.yandex.net (forward101o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::601]) (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 40E797D38D; Tue, 9 Oct 2018 08:41:24 +0000 (UTC) (envelope-from bu7cher@yandex.ru) Received: from mxback6j.mail.yandex.net (mxback6j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10f]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by forward101o.mail.yandex.net (Yandex) with ESMTPS id 0998B13457B2; Tue, 9 Oct 2018 11:41:13 +0300 (MSK) Received: from smtp4p.mail.yandex.net (smtp4p.mail.yandex.net [2a02:6b8:0:1402::15:6]) by mxback6j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id VhDj5ObxxV-fCrm2jeI; Tue, 09 Oct 2018 11:41:12 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1539074472; bh=FglhlcJjHSvotcL/7q1HCuckaVkUhTe7Sw2NY4Ywpco=; h=Subject:To:Cc:References:From:Message-ID:Date:In-Reply-To; b=YrWxNn101aAbnuwBJq56S0L7FnuCp6C0bQ1LhMGoR36P10xPbkXuMHHFrnOvAfSxK sMgxr/TP1dvfueytoCel7jc0JUpegA3OPNDL4LxTDJ41+3HjbDn/dmU+naWM2FgVYs VM1OgjILr+ouU5HEMGc+teSM17sX9WJyIr1tkH7E= Received: by smtp4p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id rMzU0XEW2V-fC4Cu6bI; Tue, 09 Oct 2018 11:41:12 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client certificate not present) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1539074472; bh=FglhlcJjHSvotcL/7q1HCuckaVkUhTe7Sw2NY4Ywpco=; h=Subject:To:Cc:References:From:Message-ID:Date:In-Reply-To; b=YrWxNn101aAbnuwBJq56S0L7FnuCp6C0bQ1LhMGoR36P10xPbkXuMHHFrnOvAfSxK sMgxr/TP1dvfueytoCel7jc0JUpegA3OPNDL4LxTDJ41+3HjbDn/dmU+naWM2FgVYs VM1OgjILr+ouU5HEMGc+teSM17sX9WJyIr1tkH7E= Authentication-Results: smtp4p.mail.yandex.net; dkim=pass header.i=@yandex.ru Subject: Re: svn commit: r264378 - head/sys/geom/part To: John Baldwin , Marcel Moolenaar , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Cc: Josh Paetzel References: <201404122028.s3CKSdo1026394@svn.freebsd.org> From: "Andrey V. Elsukov" Openpgp: id=E6591E1B41DA1516F0C9BC0001C5EA0410C8A17A Autocrypt: addr=bu7cher@yandex.ru; prefer-encrypt=mutual; keydata= xsBNBEwBF1kBCADB9sXFhBEUy8qQ4X63Y8eBatYMHGEFWN9ypS5lI3RE6qQW2EYbxNk7qUC5 21YIIS1mMFVBEfvR7J9uc7yaYgFCEb6Sce1RSO4ULN2mRKGHP3/Sl0ijZEjWHV91hY1YTHEF ZW/0GYinDf56sYpDDehaBF5wkWIo1+QK5nmj3vl0DIDCMNd7QEiWpyLVwECgLX2eOAXByT8B bCqVhJGcG6iFP7/B9Ll6uX5gb8thM9LM+ibwErDBVDGiOgvfxqidab7fdkh893IBCXa82H9N CNwnEtcgzh+BSKK5BgvPohFMgRwjti37TSxwLu63QejRGbZWSz3OK3jMOoF63tCgn7FvABEB AAHNIkFuZHJleSBWLiBFbHN1a292IDxhZUBmcmVlYnNkLm9yZz7CwHsEEwECACUCGwMGCwkI BwMCBhUIAgkKCwQWAgMBAh4BAheABQJMB/ruAhkBAAoJEAHF6gQQyKF6MLwH/3Ri/TZl9uo0 SepYWXOnxL6EaDVXDA+dLb1eLKC4PRBBjX29ttQ0KaWapiE6y5/AfzOPmRtHLrHYHjd/aiHX GMLHcYRXD+5GvdkK8iMALrZ28X0JXyuuZa8rAxWIWmCbYHNSBy2unqWgTI04Erodk90IALgM 9JeHN9sFqTM6zalrMnTzlcmel4kcjT3lyYw3vOKgoYLtsLhKZSbJoVVVlvRlGBpHFJI5AoYJ SyfXoN0rcX6k9X7Isp2K50YjqxV4v78xluh1puhwZyC0p8IShPrmrp9Oy9JkMX90o6UAXdGU KfdExJuGJfUZOFBTtNIMNIAKfMTjhpRhxONIr0emxxDOwE0ETAEXWQEIAJ2p6l9LBoqdH/0J PEFDY2t2gTvAuzz+8zs3R03dFuHcNbOwjvWCG0aOmVpAzkRa8egn5JB4sZaFUtKPYJEQ1Iu+ LUBwgvtXf4vWpzC67zs2dDuiW4LamH5p6xkTD61aHR7mCB3bg2TUjrDWn2Jt44cvoYxj3dz4 S49U1rc9ZPgD5axCNv45j72tggWlZvpefThP7xT1OlNTUqye2gAwQravXpZkl5JG4eOqJVIU X316iE3qso0iXRUtO7OseBf0PiVmk+wCahdreHOeOxK5jMhYkPKVn7z1sZiB7W2H2TojbmcK HZC22sz7Z/H36Lhg1+/RCnGzdEcjGc8oFHXHCxUAEQEAAcLAXwQYAQIACQUCTAEXWQIbDAAK CRABxeoEEMihegkYCAC3ivGYNe2taNm/4Nx5GPdzuaAJGKWksV+w9mo7dQvU+NmI2az5w8vw 98OmX7G0OV9snxMW+6cyNqBrVFTu33VVNzz9pnqNCHxGvj5dL5ltP160JV2zw2bUwJBYsgYQ WfyJJIM7l3gv5ZS3DGqaGIm9gOK1ANxfrR5PgPzvI9VxDhlr2juEVMZYAqPLEJe+SSxbwLoz BcFCNdDAyXcaAzXsx/E02YWm1hIWNRxanAe7Vlg7OL+gvLpdtrYCMg28PNqKNyrQ87LQ49O9 50IIZDOtNFeR0FGucjcLPdS9PiEqCoH7/waJxWp6ydJ+g4OYRBYNM0EmMgy1N85JJrV1mi5i Message-ID: <2f72f3b3-d890-bed2-742e-fcc39c5618e3@yandex.ru> Date: Tue, 9 Oct 2018 11:39:44 +0300 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="yvjgFeAWaKg8ZMcddEzT9nehImflvxhXR" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 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: Tue, 09 Oct 2018 08:41:25 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --yvjgFeAWaKg8ZMcddEzT9nehImflvxhXR Content-Type: multipart/mixed; boundary="UUFPHaWZ3j330PFv2DjsmCJAQS5247FHD"; protected-headers="v1" From: "Andrey V. Elsukov" To: John Baldwin , Marcel Moolenaar , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Cc: Josh Paetzel Message-ID: <2f72f3b3-d890-bed2-742e-fcc39c5618e3@yandex.ru> Subject: Re: svn commit: r264378 - head/sys/geom/part References: <201404122028.s3CKSdo1026394@svn.freebsd.org> In-Reply-To: --UUFPHaWZ3j330PFv2DjsmCJAQS5247FHD Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 08.10.2018 19:46, John Baldwin wrote: > This needs a way to be overridden. If you have a machine installed wit= h a > layout created prior to this change (e.g. a zpool mirror or RAID or som= e > other mirror or RAID), you can no longer create a matching partition si= nce > the starting sector is now always 40 instead of 34 and the partition si= ze > won't match. Also, while we may want to create sane layouts by default= , we > should probably always provide a way to create less-sane layouts that a= re > still conformant to the spec. I do wonder if this kind of default > preference shouldn't belong in the userspace gpart tool rather than the= > kernel and the kernel should create any compliant layout as requested b= y > userland instead. >=20 > jpaetzel@ just ran into this case where he can't replace a failed disk = in a > system running 12 that was first formatted on 10, so it's not academic.= As a workaround you can try to copy first 34 sectors from old disk to new using dd(1). And then use `gpart recover`. I think this should work. --=20 WBR, Andrey V. Elsukov --UUFPHaWZ3j330PFv2DjsmCJAQS5247FHD-- --yvjgFeAWaKg8ZMcddEzT9nehImflvxhXR Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/ iQEzBAEBCAAdFiEE5lkeG0HaFRbwybwAAcXqBBDIoXoFAlu8aVQACgkQAcXqBBDI oXrrJgf/aB9cfSsjA+yo4onp8hGRu/vvoWZExjs7X0+x9DGR3zrxYHFrL5u8uj6K 2G3/9ynBxZzHDheudWNp04ZRgb8fJM/snHidDNjWG4bWiRCdlejetms6BwCjqAML y1adVVbd3drvqFHqRLZSm18o8H+efMeJz5VILjNdCnPAzBSI+KS2heuvhxAB2xbq OIThPAz/hWR4jefbSx9YPedPZ17riboOizym0EUAUgd1vyA7OMWB06hSeRBTBtbu 9dW0pyoh04MdM+aLvRgyFeMyRbaioqjKs+wXRSaFFmkDdX6uE4Y1VGzM1IQuR/jv z3+Ox9IL138fuz2O9UI7dTNy1b4ImQ== =Euo6 -----END PGP SIGNATURE----- --yvjgFeAWaKg8ZMcddEzT9nehImflvxhXR-- From owner-svn-src-head@freebsd.org Tue Oct 9 13:26:08 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2120E10CEBD5; Tue, 9 Oct 2018 13:26:08 +0000 (UTC) (envelope-from jtl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C6D3A88C4C; Tue, 9 Oct 2018 13:26:07 +0000 (UTC) (envelope-from jtl@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A8FF812AB4; Tue, 9 Oct 2018 13:26:07 +0000 (UTC) (envelope-from jtl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w99DQ7NP083894; Tue, 9 Oct 2018 13:26:07 GMT (envelope-from jtl@FreeBSD.org) Received: (from jtl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w99DQ7MN083891; Tue, 9 Oct 2018 13:26:07 GMT (envelope-from jtl@FreeBSD.org) Message-Id: <201810091326.w99DQ7MN083891@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jtl set sender to jtl@FreeBSD.org using -f From: "Jonathan T. Looney" Date: Tue, 9 Oct 2018 13:26:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339251 - in head/sys: net netinet netinet6 X-SVN-Group: head X-SVN-Commit-Author: jtl X-SVN-Commit-Paths: in head/sys: net netinet netinet6 X-SVN-Commit-Revision: 339251 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.27 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: Tue, 09 Oct 2018 13:26:08 -0000 Author: jtl Date: Tue Oct 9 13:26:06 2018 New Revision: 339251 URL: https://svnweb.freebsd.org/changeset/base/339251 Log: There are three places where we return from a function which entered an epoch section without exiting that epoch section. This is bad for two reasons: the epoch section won't exit, and we will leave the epoch tracker from the stack on the epoch list. Fix the epoch leak by making sure we exit epoch sections before returning. Reviewed by: ae, gallatin, mmacy Approved by: re (gjb, kib) Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D17450 Modified: head/sys/net/if_lagg.c head/sys/netinet/ip_options.c head/sys/netinet6/udp6_usrreq.c Modified: head/sys/net/if_lagg.c ============================================================================== --- head/sys/net/if_lagg.c Tue Oct 9 10:49:19 2018 (r339250) +++ head/sys/net/if_lagg.c Tue Oct 9 13:26:06 2018 (r339251) @@ -2033,15 +2033,18 @@ lagg_lb_porttable(struct lagg_softc *sc, struct lagg_p { struct lagg_lb *lb = (struct lagg_lb *)sc->sc_psc; struct lagg_port *lp_next; - int i = 0; + int i = 0, rv; + rv = 0; bzero(&lb->lb_ports, sizeof(lb->lb_ports)); LAGG_RLOCK(); CK_SLIST_FOREACH(lp_next, &sc->sc_ports, lp_entries) { if (lp_next == lp) continue; - if (i >= LAGG_MAX_PORTS) - return (EINVAL); + if (i >= LAGG_MAX_PORTS) { + rv = EINVAL; + break; + } if (sc->sc_ifflags & IFF_DEBUG) printf("%s: port %s at index %d\n", sc->sc_ifname, lp_next->lp_ifp->if_xname, i); @@ -2049,7 +2052,7 @@ lagg_lb_porttable(struct lagg_softc *sc, struct lagg_p } LAGG_RUNLOCK(); - return (0); + return (rv); } static int Modified: head/sys/netinet/ip_options.c ============================================================================== --- head/sys/netinet/ip_options.c Tue Oct 9 10:49:19 2018 (r339250) +++ head/sys/netinet/ip_options.c Tue Oct 9 13:26:06 2018 (r339251) @@ -110,16 +110,16 @@ ip_dooptions(struct mbuf *m, int pass) struct nhop4_extended nh_ext; struct sockaddr_in ipaddr = { sizeof(ipaddr), AF_INET }; - NET_EPOCH_ENTER(); /* Ignore or reject packets with IP options. */ if (V_ip_doopts == 0) return 0; else if (V_ip_doopts == 2) { type = ICMP_UNREACH; code = ICMP_UNREACH_FILTER_PROHIB; - goto bad; + goto bad_unlocked; } + NET_EPOCH_ENTER(); dst = ip->ip_dst; cp = (u_char *)(ip + 1); cnt = (ip->ip_hl << 2) - sizeof (struct ip); @@ -388,6 +388,7 @@ dropit: return (0); bad: NET_EPOCH_EXIT(); +bad_unlocked: icmp_error(m, type, code, 0, 0); IPSTAT_INC(ips_badoptions); return (1); Modified: head/sys/netinet6/udp6_usrreq.c ============================================================================== --- head/sys/netinet6/udp6_usrreq.c Tue Oct 9 10:49:19 2018 (r339250) +++ head/sys/netinet6/udp6_usrreq.c Tue Oct 9 13:26:06 2018 (r339251) @@ -434,8 +434,8 @@ udp6_input(struct mbuf **mp, int *offp, int proto) INP_RUNLOCK(last); } else INP_RUNLOCK(last); - INP_INFO_RUNLOCK_ET(pcbinfo, et); inp_lost: + INP_INFO_RUNLOCK_ET(pcbinfo, et); return (IPPROTO_DONE); } /* From owner-svn-src-head@freebsd.org Tue Oct 9 13:34:02 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E7A2210CEF82 for ; Tue, 9 Oct 2018 13:34:01 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-it1-x144.google.com (mail-it1-x144.google.com [IPv6:2607:f8b0:4864:20::144]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7DEA089247 for ; Tue, 9 Oct 2018 13:34:01 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it1-x144.google.com with SMTP id w200-v6so2630419itc.4 for ; Tue, 09 Oct 2018 06:34:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=RL4p2mNxQk9Eb7VpjRNrcelJamk279CqIiTm4bAMWxk=; b=OeYMb/pZ2nC3dTpxL+/6mBPNqmYApBwskJ99v8IT7pDFcsb/A3BfY0sm3yxfdpuGZg vA9uBZWRcs8nz86hLJ5mjRRKsi/0lKlotFsBNOS/3rUEY9HLv7vstefm5MJBS8z/leCJ kOcFrMjLEIUGo49QjqHMdzWzfcpFGyrp7pcCD1Hs3m83oMpmmpEbw04ZhtCSyQzM3xNL QN83OlONNykrH6OtnbqBkEpivgCJR/N51NE5cbrfAE47UGvNjPiQzkYh0lzBpW/mxh0g 2k5Al5Tgeot+vEHFWbB5dW8FbqLsGMTEQWu9FYdG+NL77a8E+k9v8yY+XRO1i8Otn5tn 6COw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=RL4p2mNxQk9Eb7VpjRNrcelJamk279CqIiTm4bAMWxk=; b=Lx6pyJaOB9LrQYf+OgWiC1EMLgTeHEdmpPMLK4WbwSTjjZgA9HXFq2VBWF/vaSqmCD qo0Yk0/41ENKXgyNMgMNBviVNgYlmCxEy890cX+3q+BG9ANFNI/kMAfzIGEzNlUv7/Bt YoX/6gMzBbzokoCuEWso+dLINqropIKXmfNRLzjCnCvbL+UGA0V3vfj+COjT0LFd4j83 Fs2eTOixhUjMtM+JFCakMmX54LDu6VK9Jse+Ok/zZo3LtLowtPbpKWUGEYA4H7Z4X4NI dCzpH1e6tbM410NUAgPB1lfgk1lIx1lwLwD4ImeBQ5COLff7kNUVRv22ltiIwQ8iNCLi vZZA== X-Gm-Message-State: ABuFfojivs1dOPSrWk5dESRxsfBBOWDWUWiQddY1ZmddNS2sDZUQOiGm /l4y6t5cUOq6yhpWLoRVYxv4OZL/LP5LbgloFlS2zw== X-Google-Smtp-Source: ACcGV62ChbO8zlJnAaA5L3AuIPlx6XgvWiSTiJCVrJJdDwonujqj4ZRtIq6+d3dM+nyJeVolFcN8+p2cEhdHrPwPqeE= X-Received: by 2002:a02:14a:: with SMTP id c71-v6mr21313436jad.93.1539092040534; Tue, 09 Oct 2018 06:34:00 -0700 (PDT) MIME-Version: 1.0 References: <201404122028.s3CKSdo1026394@svn.freebsd.org> <2f72f3b3-d890-bed2-742e-fcc39c5618e3@yandex.ru> In-Reply-To: <2f72f3b3-d890-bed2-742e-fcc39c5618e3@yandex.ru> From: Warner Losh Date: Tue, 9 Oct 2018 07:33:48 -0600 Message-ID: Subject: Re: svn commit: r264378 - head/sys/geom/part To: "Andrey V. Elsukov" Cc: John Baldwin , Marcel Moolenaar , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org, Josh Paetzel Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.27 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 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: Tue, 09 Oct 2018 13:34:02 -0000 On Tue, Oct 9, 2018 at 2:41 AM Andrey V. Elsukov wrote: > On 08.10.2018 19:46, John Baldwin wrote: > > This needs a way to be overridden. If you have a machine installed with > a > > layout created prior to this change (e.g. a zpool mirror or RAID or some > > other mirror or RAID), you can no longer create a matching partition > since > > the starting sector is now always 40 instead of 34 and the partition size > > won't match. Also, while we may want to create sane layouts by default, > we > > should probably always provide a way to create less-sane layouts that are > > still conformant to the spec. I do wonder if this kind of default > > preference shouldn't belong in the userspace gpart tool rather than the > > kernel and the kernel should create any compliant layout as requested by > > userland instead. > > > > jpaetzel@ just ran into this case where he can't replace a failed disk > in a > > system running 12 that was first formatted on 10, so it's not academic. > > As a workaround you can try to copy first 34 sectors from old disk to > new using dd(1). And then use `gpart recover`. I think this should work. > Clever hack, but we shouldn't need crazy stuff like this.... Yes. This absolutely needs to be in userland, under user control. The rounding should *ALWAYS* be optional. The reported geometry that the code bases the 'rounding' on is bogus often times, and not invariant. I've fought with this misfeature since I was making CF images on a USB adapter that never had the right geometry for the system it was deployed into. It's silly. Warner From owner-svn-src-head@freebsd.org Tue Oct 9 14:05:12 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C274C10CFD74; Tue, 9 Oct 2018 14:05:12 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 762598A6BC; Tue, 9 Oct 2018 14:05:12 +0000 (UTC) (envelope-from emaste@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 56DE313149; Tue, 9 Oct 2018 14:05:12 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w99E5Cfk004695; Tue, 9 Oct 2018 14:05:12 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w99E5CWs004694; Tue, 9 Oct 2018 14:05:12 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201810091405.w99E5CWs004694@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 9 Oct 2018 14:05:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339252 - head/contrib/libevent X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/contrib/libevent X-SVN-Commit-Revision: 339252 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.27 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: Tue, 09 Oct 2018 14:05:12 -0000 Author: emaste Date: Tue Oct 9 14:05:11 2018 New Revision: 339252 URL: https://svnweb.freebsd.org/changeset/base/339252 Log: Copy libevent sources to contrib To replace the libevent embedded in ntp, for OpenSSL 1.1.1 compat. Approved by: re (gjb) Added: head/contrib/libevent/ - copied from r339250, vendor/libevent/dist/ From owner-svn-src-head@freebsd.org Tue Oct 9 14:19:27 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D60A810AB3B5 for ; Tue, 9 Oct 2018 14:19:27 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from outbound1b.ore.mailhop.org (outbound1b.ore.mailhop.org [54.200.247.200]) (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 51F238AE66 for ; Tue, 9 Oct 2018 14:19:27 +0000 (UTC) (envelope-from ian@freebsd.org) X-MHO-RoutePath: aGlwcGll X-MHO-User: 4f93d205-cbce-11e8-aed8-99744f00ac98 X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 67.177.211.60 X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (unknown [67.177.211.60]) by outbound1.ore.mailhop.org (Halon) with ESMTPSA id 4f93d205-cbce-11e8-aed8-99744f00ac98; Tue, 09 Oct 2018 14:19:20 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id w99EJJqe012906; Tue, 9 Oct 2018 08:19:19 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: <1539094759.72469.37.camel@freebsd.org> Subject: Re: svn commit: r264378 - head/sys/geom/part From: Ian Lepore To: Warner Losh , "Andrey V. Elsukov" Cc: John Baldwin , Marcel Moolenaar , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org, Josh Paetzel Date: Tue, 09 Oct 2018 08:19:19 -0600 In-Reply-To: References: <201404122028.s3CKSdo1026394@svn.freebsd.org> <2f72f3b3-d890-bed2-742e-fcc39c5618e3@yandex.ru> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.18.5.1 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 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: Tue, 09 Oct 2018 14:19:28 -0000 On Tue, 2018-10-09 at 07:33 -0600, Warner Losh wrote: > On Tue, Oct 9, 2018 at 2:41 AM Andrey V. Elsukov > wrote: > > > > > On 08.10.2018 19:46, John Baldwin wrote: > > > > > > This needs a way to be overridden.  If you have a machine > > > installed with > > a > > > > > > layout created prior to this change (e.g. a zpool mirror or RAID > > > or some > > > other mirror or RAID), you can no longer create a matching > > > partition > > since > > > > > > the starting sector is now always 40 instead of 34 and the > > > partition size > > > won't match.  Also, while we may want to create sane layouts by > > > default, > > we > > > > > > should probably always provide a way to create less-sane layouts > > > that are > > > still conformant to the spec.  I do wonder if this kind of > > > default > > > preference shouldn't belong in the userspace gpart tool rather > > > than the > > > kernel and the kernel should create any compliant layout as > > > requested by > > > userland instead. > > > > > > jpaetzel@ just ran into this case where he can't replace a failed > > > disk > > in a > > > > > > system running 12 that was first formatted on 10, so it's not > > > academic. > > As a workaround you can try to copy first 34 sectors from old disk > > to > > new using dd(1). And then use `gpart recover`. I think this should > > work. > > > Clever hack, but we shouldn't need crazy stuff like this.... > > Yes. This absolutely needs to be in userland, under user control. The > rounding should *ALWAYS* be optional. The reported geometry that the > code > bases the 'rounding' on is bogus often times, and not invariant. I've > fought with this misfeature since I was making CF images on a USB > adapter > that never had the right geometry for the system it was deployed > into. It's > silly. > > Warner While we're at it, kern.geom.part.mbr.enforce_chs is another thing that needs to be controllable on a per-invocation (of gpart) basis, not as a system-wide setting. -- Ian From owner-svn-src-head@freebsd.org Tue Oct 9 14:27:40 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CCFB510ABA87; Tue, 9 Oct 2018 14:27:40 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 779548B684; Tue, 9 Oct 2018 14:27:40 +0000 (UTC) (envelope-from emaste@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6EBB213494; Tue, 9 Oct 2018 14:27:40 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w99EReFl014897; Tue, 9 Oct 2018 14:27:40 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w99ERevB014893; Tue, 9 Oct 2018 14:27:40 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201810091427.w99ERevB014893@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 9 Oct 2018 14:27:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339254 - head/contrib/libevent X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/contrib/libevent X-SVN-Commit-Revision: 339254 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.27 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: Tue, 09 Oct 2018 14:27:41 -0000 Author: emaste Date: Tue Oct 9 14:27:40 2018 New Revision: 339254 URL: https://svnweb.freebsd.org/changeset/base/339254 Log: libevent: eliminate in-tree usage of arc4random_addrandom Apply r338059 to newly-added libevent 2.1.18. Approved by: re (gjb) Sponsored by: The FreeBSD Foundation Modified: head/contrib/libevent/evutil_rand.c Modified: head/contrib/libevent/evutil_rand.c ============================================================================== --- head/contrib/libevent/evutil_rand.c Tue Oct 9 14:26:46 2018 (r339253) +++ head/contrib/libevent/evutil_rand.c Tue Oct 9 14:27:40 2018 (r339254) @@ -195,8 +195,6 @@ evutil_secure_rng_get_bytes(void *buf, size_t n) void evutil_secure_rng_add_bytes(const char *buf, size_t n) { - arc4random_addrandom((unsigned char*)buf, - n>(size_t)INT_MAX ? INT_MAX : (int)n); } void From owner-svn-src-head@freebsd.org Tue Oct 9 15:02:38 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AFD9210AE29A; Tue, 9 Oct 2018 15:02:38 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mail.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5DA318D320; Tue, 9 Oct 2018 15:02:38 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-2.local (ralph.baldwin.cx [66.234.199.215]) by mail.baldwin.cx (Postfix) with ESMTPSA id 11A3110AFD2; Tue, 9 Oct 2018 11:02:36 -0400 (EDT) Subject: Re: svn commit: r339251 - in head/sys: net netinet netinet6 To: "Jonathan T. Looney" , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201810091326.w99DQ7MN083891@repo.freebsd.org> From: John Baldwin Message-ID: Date: Tue, 9 Oct 2018 08:02:34 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <201810091326.w99DQ7MN083891@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mail.baldwin.cx); Tue, 09 Oct 2018 11:02:37 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx X-Virus-Status: Clean X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 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: Tue, 09 Oct 2018 15:02:38 -0000 On 10/9/18 6:26 AM, Jonathan T. Looney wrote: > Author: jtl > Date: Tue Oct 9 13:26:06 2018 > New Revision: 339251 > URL: https://svnweb.freebsd.org/changeset/base/339251 > > Log: > There are three places where we return from a function which entered an > epoch section without exiting that epoch section. This is bad for two > reasons: the epoch section won't exit, and we will leave the epoch tracker > from the stack on the epoch list. > > Fix the epoch leak by making sure we exit epoch sections before returning. Do we have some sort of simple per-thread epoch counter similar to td->td_locks that we could assert on in userret() and in the ithread loop when ithreads go to sleep to help catch leaked locks? -- John Baldwin                                                                              From owner-svn-src-head@freebsd.org Tue Oct 9 15:28:11 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 70CE810B01ED; Tue, 9 Oct 2018 15:28:11 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1CCA58E124; Tue, 9 Oct 2018 15:28:11 +0000 (UTC) (envelope-from jhb@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1300013E8F; Tue, 9 Oct 2018 15:28:11 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w99FSAJJ045773; Tue, 9 Oct 2018 15:28:10 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w99FS6rV045746; Tue, 9 Oct 2018 15:28:06 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201810091528.w99FS6rV045746@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Tue, 9 Oct 2018 15:28:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339256 - in head/contrib/serf: . auth buckets build X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in head/contrib/serf: . auth buckets build X-SVN-Commit-Revision: 339256 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.27 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: Tue, 09 Oct 2018 15:28:12 -0000 Author: jhb Date: Tue Oct 9 15:28:06 2018 New Revision: 339256 URL: https://svnweb.freebsd.org/changeset/base/339256 Log: Update Apache Serf to 1.3.9 to support OpenSSL 1.1.1. Approved by: re (rgrimes) Added: head/contrib/serf/STATUS - copied unchanged from r339246, vendor/serf/dist/STATUS Modified: head/contrib/serf/CHANGES head/contrib/serf/NOTICE head/contrib/serf/README head/contrib/serf/SConstruct head/contrib/serf/auth/auth.c head/contrib/serf/auth/auth.h head/contrib/serf/auth/auth_basic.c head/contrib/serf/auth/auth_digest.c head/contrib/serf/auth/auth_spnego.c head/contrib/serf/auth/auth_spnego.h head/contrib/serf/auth/auth_spnego_gss.c head/contrib/serf/auth/auth_spnego_sspi.c head/contrib/serf/buckets/aggregate_buckets.c head/contrib/serf/buckets/allocator.c head/contrib/serf/buckets/barrier_buckets.c head/contrib/serf/buckets/buckets.c head/contrib/serf/buckets/bwtp_buckets.c head/contrib/serf/buckets/chunk_buckets.c head/contrib/serf/buckets/dechunk_buckets.c head/contrib/serf/buckets/deflate_buckets.c head/contrib/serf/buckets/file_buckets.c head/contrib/serf/buckets/headers_buckets.c head/contrib/serf/buckets/iovec_buckets.c head/contrib/serf/buckets/limit_buckets.c head/contrib/serf/buckets/mmap_buckets.c head/contrib/serf/buckets/request_buckets.c head/contrib/serf/buckets/response_body_buckets.c head/contrib/serf/buckets/response_buckets.c head/contrib/serf/buckets/simple_buckets.c head/contrib/serf/buckets/socket_buckets.c head/contrib/serf/buckets/ssl_buckets.c head/contrib/serf/build/check.py head/contrib/serf/build/gen_def.py head/contrib/serf/context.c head/contrib/serf/incoming.c head/contrib/serf/outgoing.c head/contrib/serf/serf.h head/contrib/serf/serf_bucket_types.h head/contrib/serf/serf_bucket_util.h head/contrib/serf/serf_private.h head/contrib/serf/ssltunnel.c Directory Properties: head/contrib/serf/ (props changed) Modified: head/contrib/serf/CHANGES ============================================================================== --- head/contrib/serf/CHANGES Tue Oct 9 14:27:55 2018 (r339255) +++ head/contrib/serf/CHANGES Tue Oct 9 15:28:06 2018 (r339256) @@ -1,7 +1,26 @@ -Serf 1.3.8 [2014-10-20, from /tags/1.3.8, rxxxx] -Fix issue #152: CRC calculation error for gzipped http reponses > 4GB. -Fix issue #153: SSPI CredHandle not freed when APR pool is destroyed. -Fix issue #154: Disable SSLv2 and SSLv3 as both or broken. +Apache Serf 1.3.9 [2016-09-01, from tags/1.3.9, rxxxx] + serf is now Apache Serf; apply header changes (r1700062) + Fix issue #151: SCons build broken when only one library in ENVPATH + Fix issue #153: avoid SSPI handle leak + Fix issue #167: Explicitly use the ANSI version of SSPI + Fix issue #170: Allow building with Microsoft Visual Studio 2015 + Fix build of 'check' target when using VPATH-style builds (r1699858, ...) + (builddir != srcdir). + Resolve a bucket (aka "memory") leak when a request bucket is + destroyed before it is morphed into an aggregate bucket (r1699791) + Reset state variables when resetting connection (r1708849) + Fix types of passed, but unused batons (r1699986, r1699987) + Fix some usages of the openssl BIO api (r1699852) + Improve handling of bad data in the response state line. (r1699985) + Resolve several compiler issues with less common compilers + Support more overrides via SCons arguments (r1701836, ...) + Adapt to OpenSSL 1.1.x api (r1750819) + + +Serf 1.3.8 [2014-10-20, from /tags/1.3.8, r2441] + Fix issue #152: CRC calculation error for gzipped http reponses > 4GB. + Fix issue #153: SSPI CredHandle not freed when APR pool is destroyed. + Fix issue #154: Disable SSLv2 and SSLv3 as both or broken. Serf 1.3.7 [2014-08-11, from /tags/1.3.7, r2411] Modified: head/contrib/serf/NOTICE ============================================================================== --- head/contrib/serf/NOTICE Tue Oct 9 14:27:55 2018 (r339255) +++ head/contrib/serf/NOTICE Tue Oct 9 15:28:06 2018 (r339256) @@ -1,2 +1,7 @@ -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). +Apache Serf +Copyright 2015 The Apache Software Foundation + +This product includes software developed by many people, and distributed +under Contributor License Agreements to The Apache Software Foundation +(http://www.apache.org/). See the revision logs for an exact contribution +history. Modified: head/contrib/serf/README ============================================================================== --- head/contrib/serf/README Tue Oct 9 14:27:55 2018 (r339255) +++ head/contrib/serf/README Tue Oct 9 15:28:06 2018 (r339256) @@ -1,15 +1,14 @@ -Welcome to serf, a high-performance asynchronous HTTP client library. +Welcome to Apache Serf, a high-performance asynchronous HTTP client library. -The serf library is a C-based HTTP client library built upon the Apache +The Apache Serf library is a C-based HTTP client library built upon the Apache Portable Runtime (APR) library. It multiplexes connections, running the read/write communication asynchronously. Memory copies and transformations are kept to a minimum to provide high performance operation. - * Status: http://code.google.com/p/serf/wiki/ - * Site: http://code.google.com/p/serf/ - * Code: http://serf.googlecode.com/svn/ - * Issues: http://code.google.com/p/serf/issues/list - * Mail: serf-dev@googlegroups.com + * Site: http://serf.apache.org// + * Code: http://svn.apache.org/repos/asf/serf/ + * Issues: https://issues.apache.org/jira/browse/SERF + * Mail: dev@serf.apache.org * People: Justin Erenkrantz, Greg Stein ---- @@ -18,8 +17,8 @@ kept to a minimum to provide high performance operatio 1.1. SCons build system -serf uses SCons 2.3 for its build system. If it is not installed on -your system, then you can install it onto your system. If you do not +Apache Serf uses SCons 2.3 for its build system. If it is not installed +on your system, then you can install it onto your system. If you do not have permissions, then you can download and install the "local" version into your home directory. When installed privately, simply create a symlink for 'scons' in your PATH to /path/to/scons/scons.py. @@ -28,7 +27,7 @@ Fetch the scons-local package: http://prdownloads.sourceforge.net/scons/scons-local-2.3.0.tar.gz -1.2 Building serf +1.2 Building Apache Serf To build serf: @@ -70,7 +69,7 @@ $ scons --help $ scons check -1.4 Installing serf +1.4 Installing Apache Serf $ scons install Modified: head/contrib/serf/SConstruct ============================================================================== --- head/contrib/serf/SConstruct Tue Oct 9 14:27:55 2018 (r339255) +++ head/contrib/serf/SConstruct Tue Oct 9 15:28:06 2018 (r339256) @@ -1,19 +1,24 @@ # -*- python -*- # -# Copyright 2011-2012 Justin Erenkrantz and Greg Stein +# ==================================================================== +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ==================================================================== # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# import sys import os @@ -135,7 +140,8 @@ if sys.platform == 'win32': EnumVariable('MSVC_VERSION', "Visual C++ to use for building (E.g. 11.0, 9.0)", None, - allowed_values=('12.0', '11.0', '10.0', '9.0', '8.0', '6.0') + allowed_values=('14.0', '12.0', + '11.0', '10.0', '9.0', '8.0', '6.0') ), # We always documented that we handle an install layout, but in fact we @@ -177,8 +183,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetO unknown = opts.UnknownVariables() if unknown: - print 'Unknown variables:', ', '.join(unknown.keys()) - Exit(1) + print 'Warning: Used unknown variables:', ', '.join(unknown.keys()) apr = str(env['APR']) apu = str(env['APU']) @@ -210,7 +215,8 @@ incdir = '$PREFIX/include/serf-$MAJOR' # Unfortunately we can't set the .dylib compatibility_version option separately # from current_version, so don't use the PATCH level to avoid that build and # runtime patch levels have to be identical. -env['SHLIBVERSION'] = '%d.%d.%d' % (MAJOR, MINOR, 0) +if sys.platform != 'sunos5': + env['SHLIBVERSION'] = '%d.%d.%d' % (MAJOR, MINOR, 0) LIBNAME = 'libserf-%d' % (MAJOR,) if sys.platform != 'win32': @@ -223,31 +229,43 @@ env.Append(RPATH=libdir, if sys.platform == 'darwin': # linkflags.append('-Wl,-install_name,@executable_path/%s.dylib' % (LIBNAME,)) - env.Append(LINKFLAGS='-Wl,-install_name,%s/%s.dylib' % (thisdir, LIBNAME,)) + env.Append(LINKFLAGS=['-Wl,-install_name,%s/%s.dylib' % (thisdir, LIBNAME,)]) if sys.platform != 'win32': - ### gcc only. figure out appropriate test / better way to check these - ### flags, and check for gcc. - env.Append(CFLAGS='-std=c89') + def CheckGnuCC(context): + src = ''' + #ifndef __GNUC__ + oh noes! + #endif + ''' + context.Message('Checking for GNU-compatible C compiler...') + result = context.TryCompile(src, '.c') + context.Result(result) + return result - ### These warnings are not available on Solaris - if sys.platform != 'sunos5': + conf = Configure(env, custom_tests = dict(CheckGnuCC=CheckGnuCC)) + have_gcc = conf.CheckGnuCC() + env = conf.Finish() + + if have_gcc: + env.Append(CFLAGS=['-std=c89']) env.Append(CCFLAGS=['-Wdeclaration-after-statement', '-Wmissing-prototypes', '-Wall']) if debug: - env.Append(CCFLAGS='-g') + env.Append(CCFLAGS=['-g']) env.Append(CPPDEFINES=['DEBUG', '_DEBUG']) else: - env.Append(CCFLAGS='-O2') - env.Append(CPPDEFINES='NDEBUG') + env.Append(CCFLAGS=['-O2']) + env.Append(CPPDEFINES=['NDEBUG']) ### works for Mac OS. probably needs to change env.Append(LIBS=['ssl', 'crypto', 'z', ]) if sys.platform == 'sunos5': - env.Append(LIBS='m') + env.Append(LIBS=['m']) + env.Append(PLATFORM='posix') else: # Warning level 4, no unused argument warnings env.Append(CCFLAGS=['/W4', '/wd4100']) @@ -260,8 +278,8 @@ else: else: # Optimize for speed, use DLL runtime env.Append(CCFLAGS=['/O2', '/MD']) - env.Append(CPPDEFINES='NDEBUG') - env.Append(LINKFLAGS='/RELEASE') + env.Append(CPPDEFINES=['NDEBUG']) + env.Append(LINKFLAGS=['/RELEASE']) # PLAN THE BUILD SHARED_SOURCES = [] @@ -291,6 +309,7 @@ if sys.platform == 'win32': if aprstatic: apr_libs='apr-1.lib' apu_libs='aprutil-1.lib' + env.Append(LIBS=['shell32.lib', 'xml.lib']) else: apr_libs='libapr-1.lib' apu_libs='libaprutil-1.lib' @@ -307,25 +326,25 @@ if sys.platform == 'win32': CPPPATH=['$APR/include', '$APU/include']) # zlib - env.Append(LIBS='zlib.lib') + env.Append(LIBS=['zlib.lib']) if not env.get('SOURCE_LAYOUT', None): - env.Append(CPPPATH='$ZLIB/include', - LIBPATH='$ZLIB/lib') + env.Append(CPPPATH=['$ZLIB/include'], + LIBPATH=['$ZLIB/lib']) else: - env.Append(CPPPATH='$ZLIB', - LIBPATH='$ZLIB') + env.Append(CPPPATH=['$ZLIB'], + LIBPATH=['$ZLIB']) # openssl env.Append(LIBS=['libeay32.lib', 'ssleay32.lib']) if not env.get('SOURCE_LAYOUT', None): - env.Append(CPPPATH='$OPENSSL/include/openssl', - LIBPATH='$OPENSSL/lib') + env.Append(CPPPATH=['$OPENSSL/include/openssl'], + LIBPATH=['$OPENSSL/lib']) elif 0: # opensslstatic: - env.Append(CPPPATH='$OPENSSL/inc32', - LIBPATH='$OPENSSL/out32') + env.Append(CPPPATH=['$OPENSSL/inc32'], + LIBPATH=['$OPENSSL/out32']) else: - env.Append(CPPPATH='$OPENSSL/inc32', - LIBPATH='$OPENSSL/out32dll') + env.Append(CPPPATH=['$OPENSSL/inc32'], + LIBPATH=['$OPENSSL/out32dll']) else: if os.path.isdir(apr): apr = os.path.join(apr, 'bin', 'apr-1-config') @@ -351,8 +370,8 @@ else: apr_libs = '' apu_libs = '' - env.Append(CPPPATH='$OPENSSL/include') - env.Append(LIBPATH='$OPENSSL/lib') + env.Append(CPPPATH=['$OPENSSL/include']) + env.Append(LIBPATH=['$OPENSSL/lib']) # If build with gssapi, get its information and define SERF_HAVE_GSSAPI @@ -362,7 +381,7 @@ if gssapi and CALLOUT_OKAY: env['GSSAPI_LIBS'] = cmd.strip() return env.MergeFlags(cmd, unique) env.ParseConfig('$GSSAPI --libs gssapi', parse_libs) - env.Append(CPPDEFINES='SERF_HAVE_GSSAPI') + env.Append(CPPDEFINES=['SERF_HAVE_GSSAPI']) if sys.platform == 'win32': env.Append(CPPDEFINES=['SERF_HAVE_SSPI']) @@ -428,6 +447,12 @@ env.Alias('install', ['install-lib', 'install-inc', 'i tenv = env.Clone() +# MockHTTP requires C99 standard, so use it for the test suite. +cflags = tenv['CFLAGS'] +tenv.Replace(CFLAGS = [f.replace('-std=c89', '-std=c99') for f in cflags]) + +tenv.Append(CPPDEFINES=['MOCKHTTP_OPENSSL']) + TEST_PROGRAMS = [ 'serf_get', 'serf_response', 'serf_request', 'serf_spider', 'test_all', 'serf_bwtp' ] if sys.platform == 'win32': @@ -435,13 +460,22 @@ if sys.platform == 'win32': else: TEST_EXES = [ os.path.join('test', '%s' % (prog)) for prog in TEST_PROGRAMS ] -env.AlwaysBuild(env.Alias('check', TEST_EXES, sys.executable + ' build/check.py', - ENV={'PATH' : os.environ['PATH']})) - # Find the (dynamic) library in this directory tenv.Replace(RPATH=thisdir) tenv.Prepend(LIBS=[LIBNAMESTATIC, ], LIBPATH=[thisdir, ]) + +check_script = env.File('build/check.py').rstr() +test_dir = env.File('test/test_all.c').rfile().get_dir() +src_dir = env.File('serf.h').rfile().get_dir() +test_app = ("%s %s %s %s") % (sys.executable, check_script, test_dir, 'test') + +# Set the library search path for the test programs +test_env = {'PATH' : os.environ['PATH'], + 'srcdir' : src_dir} +if sys.platform != 'win32': + test_env['LD_LIBRARY_PATH'] = ':'.join(tenv.get('LIBPATH', [])) +env.AlwaysBuild(env.Alias('check', TEST_EXES, test_app, ENV=test_env)) testall_files = [ 'test/test_all.c', Copied: head/contrib/serf/STATUS (from r339246, vendor/serf/dist/STATUS) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/serf/STATUS Tue Oct 9 15:28:06 2018 (r339256, copy of r339246, vendor/serf/dist/STATUS) @@ -0,0 +1,19 @@ + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * * + * THIS RELEASE STREAM IS OPEN TO BUG FIXES. * + * * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + +This file tracks the status of releases in the 1.3.x line. + +Status of 1.3.9: + +Candidate changes: +================== + +Veto-blocked changes: +===================== + +Approved changes: +================= + Modified: head/contrib/serf/auth/auth.c ============================================================================== --- head/contrib/serf/auth/auth.c Tue Oct 9 14:27:55 2018 (r339255) +++ head/contrib/serf/auth/auth.c Tue Oct 9 15:28:06 2018 (r339256) @@ -1,16 +1,21 @@ -/* Copyright 2009 Justin Erenkrantz and Greg Stein +/* ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== */ #include "serf.h" Modified: head/contrib/serf/auth/auth.h ============================================================================== --- head/contrib/serf/auth/auth.h Tue Oct 9 14:27:55 2018 (r339255) +++ head/contrib/serf/auth/auth.h Tue Oct 9 15:28:06 2018 (r339256) @@ -1,16 +1,21 @@ -/* Copyright 2009 Justin Erenkrantz and Greg Stein +/* ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== */ #ifndef AUTH_H Modified: head/contrib/serf/auth/auth_basic.c ============================================================================== --- head/contrib/serf/auth/auth_basic.c Tue Oct 9 14:27:55 2018 (r339255) +++ head/contrib/serf/auth/auth_basic.c Tue Oct 9 15:28:06 2018 (r339256) @@ -1,16 +1,21 @@ -/* Copyright 2009 Justin Erenkrantz and Greg Stein +/* ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== */ /*** Basic authentication ***/ Modified: head/contrib/serf/auth/auth_digest.c ============================================================================== --- head/contrib/serf/auth/auth_digest.c Tue Oct 9 14:27:55 2018 (r339255) +++ head/contrib/serf/auth/auth_digest.c Tue Oct 9 15:28:06 2018 (r339256) @@ -1,16 +1,21 @@ -/* Copyright 2009 Justin Erenkrantz and Greg Stein +/* ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== */ /*** Digest authentication ***/ Modified: head/contrib/serf/auth/auth_spnego.c ============================================================================== --- head/contrib/serf/auth/auth_spnego.c Tue Oct 9 14:27:55 2018 (r339255) +++ head/contrib/serf/auth/auth_spnego.c Tue Oct 9 15:28:06 2018 (r339256) @@ -1,17 +1,23 @@ -/* Copyright 2009 Justin Erenkrantz and Greg Stein +/* ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== */ + #include "auth_spnego.h" Modified: head/contrib/serf/auth/auth_spnego.h ============================================================================== --- head/contrib/serf/auth/auth_spnego.h Tue Oct 9 14:27:55 2018 (r339255) +++ head/contrib/serf/auth/auth_spnego.h Tue Oct 9 15:28:06 2018 (r339256) @@ -1,16 +1,21 @@ -/* Copyright 2010 Justin Erenkrantz and Greg Stein +/* ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== */ #ifndef AUTH_SPNEGO_H Modified: head/contrib/serf/auth/auth_spnego_gss.c ============================================================================== --- head/contrib/serf/auth/auth_spnego_gss.c Tue Oct 9 14:27:55 2018 (r339255) +++ head/contrib/serf/auth/auth_spnego_gss.c Tue Oct 9 15:28:06 2018 (r339256) @@ -1,16 +1,21 @@ -/* Copyright 2009 Justin Erenkrantz and Greg Stein +/* ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== */ #include "serf.h" Modified: head/contrib/serf/auth/auth_spnego_sspi.c ============================================================================== --- head/contrib/serf/auth/auth_spnego_sspi.c Tue Oct 9 14:27:55 2018 (r339255) +++ head/contrib/serf/auth/auth_spnego_sspi.c Tue Oct 9 15:28:06 2018 (r339256) @@ -1,16 +1,21 @@ -/* Copyright 2010 Justin Erenkrantz and Greg Stein +/* ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== */ #include "auth_spnego.h" @@ -138,7 +143,7 @@ serf__spnego_create_sec_context(serf__spnego_context_t else sspi_package = "NTLM"; - sspi_status = AcquireCredentialsHandle( + sspi_status = AcquireCredentialsHandleA( NULL, sspi_package, SECPKG_CRED_OUTBOUND, NULL, NULL, NULL, NULL, &ctx->sspi_credentials, NULL); @@ -247,7 +252,7 @@ serf__spnego_init_sec_context(serf_connection_t *conn, sspi_out_buffer_desc.pBuffers = &sspi_out_buffer; sspi_out_buffer_desc.ulVersion = SECBUFFER_VERSION; - status = InitializeSecurityContext( + status = InitializeSecurityContextA( &ctx->sspi_credentials, ctx->initalized ? &ctx->sspi_context : NULL, ctx->target_name, Modified: head/contrib/serf/buckets/aggregate_buckets.c ============================================================================== --- head/contrib/serf/buckets/aggregate_buckets.c Tue Oct 9 14:27:55 2018 (r339255) +++ head/contrib/serf/buckets/aggregate_buckets.c Tue Oct 9 15:28:06 2018 (r339256) @@ -1,16 +1,21 @@ -/* Copyright 2002-2004 Justin Erenkrantz and Greg Stein +/* ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== */ #include "serf.h" Modified: head/contrib/serf/buckets/allocator.c ============================================================================== --- head/contrib/serf/buckets/allocator.c Tue Oct 9 14:27:55 2018 (r339255) +++ head/contrib/serf/buckets/allocator.c Tue Oct 9 15:28:06 2018 (r339256) @@ -1,16 +1,21 @@ -/* Copyright 2002-2004 Justin Erenkrantz and Greg Stein +/* ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== */ #include Modified: head/contrib/serf/buckets/barrier_buckets.c ============================================================================== --- head/contrib/serf/buckets/barrier_buckets.c Tue Oct 9 14:27:55 2018 (r339255) +++ head/contrib/serf/buckets/barrier_buckets.c Tue Oct 9 15:28:06 2018 (r339256) @@ -1,16 +1,21 @@ -/* Copyright 2002-2004 Justin Erenkrantz and Greg Stein +/* ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== */ #include Modified: head/contrib/serf/buckets/buckets.c ============================================================================== --- head/contrib/serf/buckets/buckets.c Tue Oct 9 14:27:55 2018 (r339255) +++ head/contrib/serf/buckets/buckets.c Tue Oct 9 15:28:06 2018 (r339256) @@ -1,16 +1,21 @@ -/* Copyright 2002-2004 Justin Erenkrantz and Greg Stein +/* ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== */ #include Modified: head/contrib/serf/buckets/bwtp_buckets.c ============================================================================== --- head/contrib/serf/buckets/bwtp_buckets.c Tue Oct 9 14:27:55 2018 (r339255) +++ head/contrib/serf/buckets/bwtp_buckets.c Tue Oct 9 15:28:06 2018 (r339256) @@ -1,16 +1,21 @@ -/* Copyright 2002-2004 Justin Erenkrantz and Greg Stein +/* ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== */ #include Modified: head/contrib/serf/buckets/chunk_buckets.c ============================================================================== --- head/contrib/serf/buckets/chunk_buckets.c Tue Oct 9 14:27:55 2018 (r339255) +++ head/contrib/serf/buckets/chunk_buckets.c Tue Oct 9 15:28:06 2018 (r339256) @@ -1,16 +1,21 @@ -/* Copyright 2002-2004 Justin Erenkrantz and Greg Stein +/* ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== */ #include Modified: head/contrib/serf/buckets/dechunk_buckets.c ============================================================================== --- head/contrib/serf/buckets/dechunk_buckets.c Tue Oct 9 14:27:55 2018 (r339255) +++ head/contrib/serf/buckets/dechunk_buckets.c Tue Oct 9 15:28:06 2018 (r339256) @@ -1,16 +1,21 @@ -/* Copyright 2002-2004 Justin Erenkrantz and Greg Stein +/* ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== */ #include Modified: head/contrib/serf/buckets/deflate_buckets.c ============================================================================== --- head/contrib/serf/buckets/deflate_buckets.c Tue Oct 9 14:27:55 2018 (r339255) +++ head/contrib/serf/buckets/deflate_buckets.c Tue Oct 9 15:28:06 2018 (r339256) @@ -1,16 +1,21 @@ -/* Copyright 2002-2004 Justin Erenkrantz and Greg Stein +/* ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== */ #include Modified: head/contrib/serf/buckets/file_buckets.c ============================================================================== --- head/contrib/serf/buckets/file_buckets.c Tue Oct 9 14:27:55 2018 (r339255) +++ head/contrib/serf/buckets/file_buckets.c Tue Oct 9 15:28:06 2018 (r339256) @@ -1,16 +1,21 @@ -/* Copyright 2002-2004 Justin Erenkrantz and Greg Stein +/* ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== */ #include Modified: head/contrib/serf/buckets/headers_buckets.c ============================================================================== --- head/contrib/serf/buckets/headers_buckets.c Tue Oct 9 14:27:55 2018 (r339255) +++ head/contrib/serf/buckets/headers_buckets.c Tue Oct 9 15:28:06 2018 (r339256) @@ -1,16 +1,21 @@ -/* Copyright 2004 Justin Erenkrantz and Greg Stein +/* ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@freebsd.org Tue Oct 9 15:43:46 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 93D3510B0B82; Tue, 9 Oct 2018 15:43:46 +0000 (UTC) (envelope-from jonlooney@gmail.com) Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F286E8EB35; Tue, 9 Oct 2018 15:43:45 +0000 (UTC) (envelope-from jonlooney@gmail.com) Received: by mail-ed1-f47.google.com with SMTP id r1-v6so2139098edd.7; Tue, 09 Oct 2018 08:43:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=l413lcB+H9hHocEy/xKZyiszxq37lUdmqLfVT3FldMM=; b=ZzWruewirCPpp9nxgmyxfLexuk8Rb/l31S0CzBoONWWry3chbsT8Syveku1fIueB+7 wAwc8nWE0MtWIKic21nfWwbQExCXg76s8yqcFPaQ7P9hBYRuAoHIwXY4VwKFbakdYhQw sr3ulB+Zb5w3IbxScKVQw+E3o81g1YrE7WnRo+K0EzRLz99MiXt9DbvLb1nQO6wm1K8q pmqK7E8IBOTDrGWkfY5c/4WZKZ0K4BSlIDVb2TyszB8EM2JLoWuxgE8jmy5c4RjrM9yH O58n8yyOTH0elQb/hG3A237BIwZ70J0QyZxqV14Z1O1DXgqPOA4BkohUpzRw9ycMErlA cyWg== X-Gm-Message-State: ABuFfogxNsAi7E/iCqEiOctdya3vMAUHufvJo6yBRC2aQK/xo0mEptXs JlC148a65og/6I7sT+BOYEMZyXwK X-Google-Smtp-Source: ACcGV60+M8RwEQLFfXPz+WGvIGxPtceqxfk3ONnv6QLCfG7e/LURda7ffLe0A6pvQOFCumhLvm+wAQ== X-Received: by 2002:a50:d2d4:: with SMTP id q20-v6mr36559936edg.212.1539099392716; Tue, 09 Oct 2018 08:36:32 -0700 (PDT) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com. [209.85.128.46]) by smtp.gmail.com with ESMTPSA id o10-v6sm3628521ejc.61.2018.10.09.08.36.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Oct 2018 08:36:32 -0700 (PDT) Received: by mail-wm1-f46.google.com with SMTP id z25-v6so11319254wmf.1; Tue, 09 Oct 2018 08:36:32 -0700 (PDT) X-Received: by 2002:a1c:dac9:: with SMTP id r192-v6mr2302710wmg.141.1539099391873; Tue, 09 Oct 2018 08:36:31 -0700 (PDT) MIME-Version: 1.0 References: <201810091326.w99DQ7MN083891@repo.freebsd.org> In-Reply-To: From: "Jonathan T. Looney" Date: Tue, 9 Oct 2018 11:36:20 -0400 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r339251 - in head/sys: net netinet netinet6 To: John Baldwin Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.27 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 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: Tue, 09 Oct 2018 15:43:46 -0000 On Tue, Oct 9, 2018 at 11:02 AM John Baldwin wrote: > Do we have some sort of simple per-thread epoch counter similar to > td->td_locks that we could assert on in userret() and in the ithread loop > when ithreads go to sleep to help catch leaked locks? > Yes: td->td_epochnest. There are already INVARIANTS checks in malloc (for M_WAITOK), userret(), and _sleep(). I think that covers the cases you mentioned. However, I am very much in favor of adding any additional checks which make sense. Jonathan From owner-svn-src-head@freebsd.org Tue Oct 9 17:44:26 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2E44710B5F31; Tue, 9 Oct 2018 17:44:26 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D8E1E744A6; Tue, 9 Oct 2018 17:44:25 +0000 (UTC) (envelope-from jhb@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D3AD9156D2; Tue, 9 Oct 2018 17:44:25 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w99HiP4A018892; Tue, 9 Oct 2018 17:44:25 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w99HiPCp018891; Tue, 9 Oct 2018 17:44:25 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201810091744.w99HiPCp018891@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Tue, 9 Oct 2018 17:44:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339260 - head/contrib/sendmail/src X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/contrib/sendmail/src X-SVN-Commit-Revision: 339260 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.27 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: Tue, 09 Oct 2018 17:44:26 -0000 Author: jhb Date: Tue Oct 9 17:44:25 2018 New Revision: 339260 URL: https://svnweb.freebsd.org/changeset/base/339260 Log: Update sendmail to work with the OpenSSL 1.1 API. Submitted by: jkim Approved by: re (gjb), gshapiro Obtained from: ports/mail/sendmail/files/patch-tls.c Modified: head/contrib/sendmail/src/tls.c Directory Properties: head/ (props changed) head/contrib/sendmail/ (props changed) Modified: head/contrib/sendmail/src/tls.c ============================================================================== --- head/contrib/sendmail/src/tls.c Tue Oct 9 17:29:31 2018 (r339259) +++ head/contrib/sendmail/src/tls.c Tue Oct 9 17:44:25 2018 (r339260) @@ -16,6 +16,9 @@ SM_RCSID("@(#)$Id: tls.c,v 8.127 2013-11-27 02:51:11 g # include # include # include +# if !NO_DH +# include +# endif /* !NO_DH */ # ifndef HASURANDOMDEV # include # endif /* ! HASURANDOMDEV */ @@ -44,6 +47,23 @@ static bool tls_safe_f __P((char *, long, bool)); static int tls_verify_log __P((int, X509_STORE_CTX *, const char *)); # if !NO_DH +# if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100001L || \ + (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) +static int +DH_set0_pqg(dh, p, q, g) + DH *dh; + BIGNUM *p; + BIGNUM *q; + BIGNUM *g; +{ + dh->p=p; + if (q != NULL) + dh->q=q; + dh->g=g; + return 1; /* success */ +} +# endif /* !defined() || OPENSSL_VERSION_NUMBER < 0x00907000L */ + static DH *get_dh512 __P((void)); static unsigned char dh512_p[] = @@ -64,13 +84,19 @@ static DH * get_dh512() { DH *dh = NULL; + BIGNUM *dhp_bn, *dhg_bn; if ((dh = DH_new()) == NULL) return NULL; - dh->p = BN_bin2bn(dh512_p, sizeof(dh512_p), NULL); - dh->g = BN_bin2bn(dh512_g, sizeof(dh512_g), NULL); - if ((dh->p == NULL) || (dh->g == NULL)) - return NULL; + dhp_bn = BN_bin2bn(dh512_p, sizeof(dh512_p), NULL); + dhg_bn = BN_bin2bn(dh512_g, sizeof(dh512_g), NULL); + if ((dhp_bn == NULL) || (dhg_bn == NULL) || !DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) + { + DH_free(dh); + BN_free(dhp_bn); + BN_free(dhg_bn); + return(NULL); + } return dh; } @@ -117,14 +143,17 @@ get_dh2048() }; static unsigned char dh2048_g[]={ 0x02, }; DH *dh; + BIGNUM *dhp_bn, *dhg_bn; if ((dh=DH_new()) == NULL) return(NULL); - dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL); - dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL); - if ((dh->p == NULL) || (dh->g == NULL)) + dhp_bn = BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL); + dhg_bn = BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL); + if ((dhp_bn == NULL) || (dhg_bn == NULL) || !DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) { DH_free(dh); + BN_free(dhp_bn); + BN_free(dhg_bn); return(NULL); } return(dh); @@ -708,6 +737,32 @@ load_certkey(ssl, srv, certfile, keyfile) static char server_session_id_context[] = "sendmail8"; +# if !TLS_NO_RSA +static RSA * +sm_RSA_generate_key(num, e) + int num; + unsigned long e; +{ + RSA *rsa = NULL; + BIGNUM *bn_rsa_r4; + int rc; + + bn_rsa_r4 = BN_new(); + rc = BN_set_word(bn_rsa_r4, RSA_F4); + if ((bn_rsa_r4 != NULL) && BN_set_word(bn_rsa_r4, RSA_F4) && (rsa = RSA_new()) != NULL) + { + if (!RSA_generate_key_ex(rsa, RSA_KEYLENGTH, bn_rsa_r4, NULL)) + { + RSA_free(rsa); + rsa = NULL; + } + return NULL; + } + BN_free(bn_rsa_r4); + return rsa; +} +# endif /* !TLS_NO_RSA */ + /* 0.9.8a and b have a problem with SSL_OP_TLS_BLOCK_PADDING_BUG */ #if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) # define SM_SSL_OP_TLS_BLOCK_PADDING_BUG 1 @@ -926,7 +981,7 @@ inittls(ctx, req, options, srv, certfile, keyfile, cac { /* get a pointer to the current certificate validation store */ store = SSL_CTX_get_cert_store(*ctx); /* does not fail */ - crl_file = BIO_new(BIO_s_file_internal()); + crl_file = BIO_new(BIO_s_file()); if (crl_file != NULL) { if (BIO_read_filename(crl_file, CRLFile) >= 0) @@ -1003,8 +1058,7 @@ inittls(ctx, req, options, srv, certfile, keyfile, cac if (bitset(TLS_I_RSA_TMP, req) # if SM_CONF_SHM && ShmId != SM_SHM_NO_ID && - (rsa_tmp = RSA_generate_key(RSA_KEYLENGTH, RSA_F4, NULL, - NULL)) == NULL + (rsa_tmp = sm_RSA_generate_key(RSA_KEYLENGTH, RSA_F4)) == NULL # else /* SM_CONF_SHM */ && 0 /* no shared memory: no need to generate key now */ # endif /* SM_CONF_SHM */ @@ -1209,9 +1263,10 @@ inittls(ctx, req, options, srv, certfile, keyfile, cac if (tTd(96, 2)) sm_dprintf("inittls: Generating %d bit DH parameters\n", bits); + dsa=DSA_new(); /* this takes a while! */ - dsa = DSA_generate_parameters(bits, NULL, 0, NULL, - NULL, 0, NULL); + (void)DSA_generate_parameters_ex(dsa, bits, NULL, 0, + NULL, NULL, NULL); dh = DSA_dup_DH(dsa); DSA_free(dsa); } @@ -1744,7 +1799,7 @@ tmp_rsa_key(s, export, keylength) if (rsa_tmp != NULL) RSA_free(rsa_tmp); - rsa_tmp = RSA_generate_key(RSA_KEYLENGTH, RSA_F4, NULL, NULL); + rsa_tmp = sm_RSA_generate_key(RSA_KEYLENGTH, RSA_F4); if (rsa_tmp == NULL) { if (LogLevel > 0) @@ -1971,9 +2026,9 @@ x509_verify_cb(ok, ctx) { if (LogLevel > 13) tls_verify_log(ok, ctx, "x509"); - if (ctx->error == X509_V_ERR_UNABLE_TO_GET_CRL) + if (X509_STORE_CTX_get_error(ctx) == X509_V_ERR_UNABLE_TO_GET_CRL) { - ctx->error = 0; + X509_STORE_CTX_set_error(ctx, 0); return 1; /* override it */ } } From owner-svn-src-head@freebsd.org Tue Oct 9 18:35:46 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 18C4910B7B31; Tue, 9 Oct 2018 18:35:46 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B9C71768DF; Tue, 9 Oct 2018 18:35:45 +0000 (UTC) (envelope-from emaste@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AE53C15F3D; Tue, 9 Oct 2018 18:35:45 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w99IZjOT045372; Tue, 9 Oct 2018 18:35:45 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w99IZj50045370; Tue, 9 Oct 2018 18:35:45 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201810091835.w99IZj50045370@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 9 Oct 2018 18:35:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339261 - in head: . usr.sbin/ntp/libntpevent X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in head: . usr.sbin/ntp/libntpevent X-SVN-Commit-Revision: 339261 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.27 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: Tue, 09 Oct 2018 18:35:46 -0000 Author: emaste Date: Tue Oct 9 18:35:45 2018 New Revision: 339261 URL: https://svnweb.freebsd.org/changeset/base/339261 Log: Switch ntp's embedded libevent to 2.1.18 For OpenSSL 1.1.1 compatibility. In Makefile.inc1 add (to the existing similar cases) a hack to handle dependencies across the migration. Reviewed by: jhb Approved by: re (gjb) Sponsored by: The FreeBSD Foundation. Differential Revision: https://reviews.freebsd.org/D17481 Modified: head/Makefile.inc1 head/usr.sbin/ntp/libntpevent/Makefile Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Tue Oct 9 17:44:25 2018 (r339260) +++ head/Makefile.inc1 Tue Oct 9 18:35:45 2018 (r339261) @@ -939,6 +939,13 @@ _cleanobj_fast_depend_hack: .PHONY ${LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/lib/libc/.depend.${f}.*}; \ fi .endfor +# 20181009 track migration from ntp's embedded libevent to updated one + @if [ -e "${OBJTOP}/usr.sbin/ntp/libntpevent/.depend.bufferevent_openssl.o" ] && \ + egrep -q 'contrib/ntp/sntp/libevent/bufferevent_openssl.c' \ + ${OBJTOP}/usr.sbin/ntp/libntpevent/.depend.bufferevent_openssl.o ; then \ + echo "Removing stale libevent dependencies"; \ + rm -f ${OBJTOP}/usr.sbin/ntp/libntpevent/.depend.*; \ + fi _worldtmp: .PHONY @echo Modified: head/usr.sbin/ntp/libntpevent/Makefile ============================================================================== --- head/usr.sbin/ntp/libntpevent/Makefile Tue Oct 9 17:44:25 2018 (r339260) +++ head/usr.sbin/ntp/libntpevent/Makefile Tue Oct 9 18:35:45 2018 (r339261) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${SRCTOP}/contrib/ntp/sntp/libevent +.PATH: ${SRCTOP}/contrib/libevent LIB= ntpevent INTERNALLIB= @@ -26,7 +26,7 @@ NTP_ATOMIC=noatomic .endif CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ - -I${SRCTOP}/contrib/ntp/sntp/libevent/include \ + -I${SRCTOP}/contrib/libevent/include \ -I${.CURDIR}/ CFLAGS+= -DHAVE_BSD_NICE -DHAVE_STDINT_H From owner-svn-src-head@freebsd.org Tue Oct 9 18:40:39 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9E29310B7CCD; Tue, 9 Oct 2018 18:40:39 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5059D76AEC; Tue, 9 Oct 2018 18:40:39 +0000 (UTC) (envelope-from jkim@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 31C8015F4F; Tue, 9 Oct 2018 18:40:39 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w99IedKF046348; Tue, 9 Oct 2018 18:40:39 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w99IeaKl046334; Tue, 9 Oct 2018 18:40:36 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201810091840.w99IeaKl046334@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Tue, 9 Oct 2018 18:40:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339262 - in head: sys/conf sys/contrib/dev/acpica sys/contrib/dev/acpica/common sys/contrib/dev/acpica/compiler sys/contrib/dev/acpica/components/debugger sys/contrib/dev/acpica/compon... X-SVN-Group: head X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: in head: sys/conf sys/contrib/dev/acpica sys/contrib/dev/acpica/common sys/contrib/dev/acpica/compiler sys/contrib/dev/acpica/components/debugger sys/contrib/dev/acpica/components/disassembler sys/con... X-SVN-Commit-Revision: 339262 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.27 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: Tue, 09 Oct 2018 18:40:40 -0000 Author: jkim Date: Tue Oct 9 18:40:36 2018 New Revision: 339262 URL: https://svnweb.freebsd.org/changeset/base/339262 Log: Update ACPICA to 20181003. Approved by: re (gjb) Added: head/sys/contrib/dev/acpica/components/executer/exserial.c - copied, changed from r338971, vendor-sys/acpica/dist/source/components/executer/exserial.c Modified: head/sys/conf/files head/sys/contrib/dev/acpica/changes.txt head/sys/contrib/dev/acpica/common/adisasm.c head/sys/contrib/dev/acpica/common/ahtable.c head/sys/contrib/dev/acpica/common/dmextern.c head/sys/contrib/dev/acpica/common/dmtable.c head/sys/contrib/dev/acpica/compiler/aslallocate.c head/sys/contrib/dev/acpica/compiler/aslanalyze.c head/sys/contrib/dev/acpica/compiler/aslcache.c head/sys/contrib/dev/acpica/compiler/aslcodegen.c head/sys/contrib/dev/acpica/compiler/aslcompile.c head/sys/contrib/dev/acpica/compiler/aslcompiler.l head/sys/contrib/dev/acpica/compiler/asldefine.h head/sys/contrib/dev/acpica/compiler/aslerror.c head/sys/contrib/dev/acpica/compiler/aslexternal.c head/sys/contrib/dev/acpica/compiler/aslfileio.c head/sys/contrib/dev/acpica/compiler/aslfiles.c head/sys/contrib/dev/acpica/compiler/aslfold.c head/sys/contrib/dev/acpica/compiler/aslglobal.h head/sys/contrib/dev/acpica/compiler/aslhex.c head/sys/contrib/dev/acpica/compiler/aslkeywords.y head/sys/contrib/dev/acpica/compiler/asllength.c head/sys/contrib/dev/acpica/compiler/asllisting.c head/sys/contrib/dev/acpica/compiler/asllistsup.c head/sys/contrib/dev/acpica/compiler/aslload.c head/sys/contrib/dev/acpica/compiler/asllookup.c head/sys/contrib/dev/acpica/compiler/aslmain.c head/sys/contrib/dev/acpica/compiler/aslmap.c head/sys/contrib/dev/acpica/compiler/aslmapenter.c head/sys/contrib/dev/acpica/compiler/aslmapoutput.c head/sys/contrib/dev/acpica/compiler/aslmessages.c head/sys/contrib/dev/acpica/compiler/aslmessages.h head/sys/contrib/dev/acpica/compiler/aslmethod.c head/sys/contrib/dev/acpica/compiler/aslnamesp.c head/sys/contrib/dev/acpica/compiler/asloffset.c head/sys/contrib/dev/acpica/compiler/aslopcodes.c head/sys/contrib/dev/acpica/compiler/asloperands.c head/sys/contrib/dev/acpica/compiler/aslopt.c head/sys/contrib/dev/acpica/compiler/asloptions.c head/sys/contrib/dev/acpica/compiler/aslparseop.c head/sys/contrib/dev/acpica/compiler/aslpld.c head/sys/contrib/dev/acpica/compiler/aslpredef.c head/sys/contrib/dev/acpica/compiler/aslprepkg.c head/sys/contrib/dev/acpica/compiler/aslprune.c head/sys/contrib/dev/acpica/compiler/aslresource.c head/sys/contrib/dev/acpica/compiler/aslstartup.c head/sys/contrib/dev/acpica/compiler/aslsupport.l head/sys/contrib/dev/acpica/compiler/aslsupport.y head/sys/contrib/dev/acpica/compiler/asltokens.y head/sys/contrib/dev/acpica/compiler/asltransform.c head/sys/contrib/dev/acpica/compiler/asltree.c head/sys/contrib/dev/acpica/compiler/aslutils.c head/sys/contrib/dev/acpica/compiler/aslwalks.c head/sys/contrib/dev/acpica/compiler/aslxref.c head/sys/contrib/dev/acpica/compiler/aslxrefout.c head/sys/contrib/dev/acpica/compiler/cvcompiler.c head/sys/contrib/dev/acpica/compiler/cvdisasm.c head/sys/contrib/dev/acpica/compiler/cvparser.c head/sys/contrib/dev/acpica/compiler/dtcompile.c head/sys/contrib/dev/acpica/compiler/dtcompiler.h head/sys/contrib/dev/acpica/compiler/dtexpress.c head/sys/contrib/dev/acpica/compiler/dtfield.c head/sys/contrib/dev/acpica/compiler/dtio.c head/sys/contrib/dev/acpica/compiler/dtparser.y head/sys/contrib/dev/acpica/compiler/dtsubtable.c head/sys/contrib/dev/acpica/compiler/dttable.c head/sys/contrib/dev/acpica/compiler/dttable2.c head/sys/contrib/dev/acpica/compiler/dttemplate.c head/sys/contrib/dev/acpica/compiler/dtutils.c head/sys/contrib/dev/acpica/compiler/preprocess.h head/sys/contrib/dev/acpica/compiler/prexpress.c head/sys/contrib/dev/acpica/compiler/prmacros.c head/sys/contrib/dev/acpica/compiler/prparser.l head/sys/contrib/dev/acpica/compiler/prparser.y head/sys/contrib/dev/acpica/compiler/prscan.c head/sys/contrib/dev/acpica/compiler/prutils.c head/sys/contrib/dev/acpica/components/debugger/dbinput.c head/sys/contrib/dev/acpica/components/disassembler/dmutils.c head/sys/contrib/dev/acpica/components/events/evregion.c head/sys/contrib/dev/acpica/components/events/evrgnini.c head/sys/contrib/dev/acpica/components/events/evxfregn.c head/sys/contrib/dev/acpica/components/executer/exfield.c head/sys/contrib/dev/acpica/components/hardware/hwsleep.c head/sys/contrib/dev/acpica/include/acconfig.h head/sys/contrib/dev/acpica/include/acdisasm.h head/sys/contrib/dev/acpica/include/acevents.h head/sys/contrib/dev/acpica/include/acexcep.h head/sys/contrib/dev/acpica/include/acinterp.h head/sys/contrib/dev/acpica/include/aclocal.h head/sys/contrib/dev/acpica/include/acpixf.h head/sys/contrib/dev/acpica/include/amlcode.h head/usr.sbin/acpi/acpidb/Makefile Directory Properties: head/sys/contrib/dev/acpica/ (props changed) Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Tue Oct 9 18:35:45 2018 (r339261) +++ head/sys/conf/files Tue Oct 9 18:40:36 2018 (r339262) @@ -439,6 +439,7 @@ contrib/dev/acpica/components/executer/exregion.c opti contrib/dev/acpica/components/executer/exresnte.c optional acpi contrib/dev/acpica/components/executer/exresolv.c optional acpi contrib/dev/acpica/components/executer/exresop.c optional acpi +contrib/dev/acpica/components/executer/exserial.c optional acpi contrib/dev/acpica/components/executer/exstore.c optional acpi contrib/dev/acpica/components/executer/exstoren.c optional acpi contrib/dev/acpica/components/executer/exstorob.c optional acpi Modified: head/sys/contrib/dev/acpica/changes.txt ============================================================================== --- head/sys/contrib/dev/acpica/changes.txt Tue Oct 9 18:35:45 2018 (r339261) +++ head/sys/contrib/dev/acpica/changes.txt Tue Oct 9 18:40:36 2018 (r339262) @@ -1,4 +1,111 @@ ---------------------------------------- +03 October 2018. Summary of changes for version 20181003: + + +2) iASL Compiler/Disassembler and Tools: + +Fixed a regression introduced in version 20180927 that could cause the +compiler to fault, especially with NamePaths containing one or more +carats (^). Such as: ^^_SB_PCI0 + +Added a new remark for the Sleep() operator when the sleep time operand +is larger than one second. This is a very long time for the ASL/BIOS code +and may not be what was intended by the ASL writer. + +---------------------------------------- +27 September 2018. Summary of changes for version 20180927: + + +1) ACPICA kernel-resident subsystem: + +Updated the GPE support to clear the status of all ACPI events when +entering any/all sleep states in order to avoid premature wakeups. In +theory, this may cause some wakeup events to be missed, but the +likelihood of this is small. This change restores the original behavior +of the ACPICA code in order to fix a regression seen from the previous +"Stop unconditionally clearing ACPI IRQs during suspend/resume" change. +This regression could cause some systems to incorrectly wake immediately. + +Updated the execution of the _REG methods during initialization and +namespace loading to bring the behavior into closer conformance to the +ACPI specification and other ACPI implementations: + +From the ACPI specification 6.2A, section 6.5.4 "_REG (Region): + "Control methods must assume all operation regions are inaccessible +until the _REG(RegionSpace, 1) method is executed" + + "The exceptions to this rule are: +1. OSPM must guarantee that the following operation regions are always +accessible: + SystemIO operation regions. + SystemMemory operation regions when accessing memory returned by the +System Address Map reporting interfaces." + +Since the state of both the SystemIO and SystemMemory address spaces are +defined by the specification to never change, this ACPICA change ensures +that now _REG is never called on them. This solves some problems seen in +the field and provides compatibility with other ACPI implementations. An +update to the upcoming new version of the ACPI specification will help +clarify this behavior. + +Updated the implementation of support for the Generic Serial Bus. For the +"bidirectional" protocols, the internal implementation now automatically +creates a return data buffer of the maximum size (255). This handles the +worst-case for data that is returned from the serial bus handler, and +fixes some problems seen in the field. This new buffer is directly +returned to the ASL. As such, there is no true "bidirectional" buffer, +which matches the ACPI specification. This is the reason for the "double +store" seen in the example ASL code in the specification, shown below: + +Word Process Call (AttribProcessCall): + OperationRegion(TOP1, GenericSerialBus, 0x00, 0x100) + Field(TOP1, BufferAcc, NoLock, Preserve) + { + FLD1, 8, // Virtual register at command value 1. + } + + Name(BUFF, Buffer(20){}) // Create GenericSerialBus data buffer + // as BUFF + CreateWordField(BUFF, 0x02, DATA) // DATA = Data (Word) + + Store(0x5416, DATA) // Save 0x5416 into the data buffer + Store(Store(BUFF, FLD1), BUFF) // Invoke a write/read Process Call +transaction + // This is the "double store". The write to + // FLD1 returns a new buffer, which is stored + // back into BUFF with the second Store. + + +2) iASL Compiler/Disassembler and Tools: + +iASL: Implemented detection of extraneous/redundant uses of the Offset() +operator within a Field Unit list. A remark is now issued for these. For +example, the first two of the Offset() operators below are extraneous. +Because both the compiler and the interpreter track the offsets +automatically, these Offsets simply refer to the current offset and are +unnecessary. Note, when optimization is enabled, the iASL compiler will +in fact remove the redundant Offset operators and will not emit any AML +code for them. + + OperationRegion (OPR1, SystemMemory, 0x100, 0x100) + Field (OPR1) + { + Offset (0), // Never needed + FLD1, 32, + Offset (4), // Redundant, offset is already 4 (bytes) + FLD2, 8, + Offset (64), // OK use of Offset. + FLD3, 16, + } +dsdt.asl 14: Offset (0), +Remark 2158 - ^ Unnecessary/redundant use of Offset +operator + +dsdt.asl 16: Offset (4), +Remark 2158 - ^ Unnecessary/redundant use of Offset +operator + +---------------------------------------- 10 August 2018. Summary of changes for version 20180810: Modified: head/sys/contrib/dev/acpica/common/adisasm.c ============================================================================== --- head/sys/contrib/dev/acpica/common/adisasm.c Tue Oct 9 18:35:45 2018 (r339261) +++ head/sys/contrib/dev/acpica/common/adisasm.c Tue Oct 9 18:40:36 2018 (r339262) @@ -576,11 +576,11 @@ AdDisassembleOneTable ( DisasmFilename, CmGetFileSize (File)); } - if (Gbl_MapfileFlag) + if (AslGbl_MapfileFlag) { fprintf (stderr, "%14s %s - %u bytes\n", - Gbl_Files[ASL_FILE_MAP_OUTPUT].ShortDescription, - Gbl_Files[ASL_FILE_MAP_OUTPUT].Filename, + AslGbl_Files[ASL_FILE_MAP_OUTPUT].ShortDescription, + AslGbl_Files[ASL_FILE_MAP_OUTPUT].Filename, FlGetFileSize (ASL_FILE_MAP_OUTPUT)); } } Modified: head/sys/contrib/dev/acpica/common/ahtable.c ============================================================================== --- head/sys/contrib/dev/acpica/common/ahtable.c Tue Oct 9 18:35:45 2018 (r339261) +++ head/sys/contrib/dev/acpica/common/ahtable.c Tue Oct 9 18:40:36 2018 (r339262) @@ -159,7 +159,7 @@ const AH_TABLE * AcpiAhGetTableInfo ( char *Signature); -extern const AH_TABLE Gbl_AcpiSupportedTables[]; +extern const AH_TABLE AcpiGbl_SupportedTables[]; /******************************************************************************* @@ -181,7 +181,7 @@ AcpiAhGetTableInfo ( const AH_TABLE *Info; - for (Info = Gbl_AcpiSupportedTables; Info->Signature; Info++) + for (Info = AcpiGbl_SupportedTables; Info->Signature; Info++) { if (ACPI_COMPARE_NAME (Signature, Info->Signature)) { @@ -197,7 +197,7 @@ AcpiAhGetTableInfo ( * Note: Any tables added here should be duplicated within AcpiDmTableData * in the file common/dmtable.c */ -const AH_TABLE Gbl_AcpiSupportedTables[] = +const AH_TABLE AcpiGbl_SupportedTables[] = { {ACPI_SIG_ASF, "Alert Standard Format table"}, {ACPI_SIG_BERT, "Boot Error Record Table"}, Modified: head/sys/contrib/dev/acpica/common/dmextern.c ============================================================================== --- head/sys/contrib/dev/acpica/common/dmextern.c Tue Oct 9 18:35:45 2018 (r339261) +++ head/sys/contrib/dev/acpica/common/dmextern.c Tue Oct 9 18:40:36 2018 (r339262) @@ -520,27 +520,27 @@ AcpiDmGetExternalsFromFile ( UINT32 ImportCount = 0; - if (!Gbl_ExternalRefFilename) + if (!AslGbl_ExternalRefFilename) { return; } /* Open the file */ - ExternalRefFile = fopen (Gbl_ExternalRefFilename, "r"); + ExternalRefFile = fopen (AslGbl_ExternalRefFilename, "r"); if (!ExternalRefFile) { fprintf (stderr, "Could not open external reference file \"%s\"\n", - Gbl_ExternalRefFilename); + AslGbl_ExternalRefFilename); AslAbort (); return; } /* Each line defines a method */ - while (fgets (StringBuffer, ASL_STRING_BUFFER_SIZE, ExternalRefFile)) + while (fgets (AslGbl_StringBuffer, ASL_STRING_BUFFER_SIZE, ExternalRefFile)) { - Token = strtok (StringBuffer, METHOD_SEPARATORS); /* "External" */ + Token = strtok (AslGbl_StringBuffer, METHOD_SEPARATORS); /* "External" */ if (!Token) { continue; @@ -593,7 +593,7 @@ AcpiDmGetExternalsFromFile ( /* Add this external to the global list */ AcpiOsPrintf ("%s: Importing method external (%u arguments) %s\n", - Gbl_ExternalRefFilename, ArgCount, MethodName); + AslGbl_ExternalRefFilename, ArgCount, MethodName); AcpiDmAddPathToExternalList (MethodName, ACPI_TYPE_METHOD, ArgCount, (ACPI_EXT_RESOLVED_REFERENCE | ACPI_EXT_ORIGIN_FROM_FILE)); @@ -604,7 +604,7 @@ AcpiDmGetExternalsFromFile ( { fprintf (stderr, "Did not find any external methods in reference file \"%s\"\n", - Gbl_ExternalRefFilename); + AslGbl_ExternalRefFilename); } else { @@ -613,7 +613,7 @@ AcpiDmGetExternalsFromFile ( AcpiDmAddExternalListToNamespace (); AcpiOsPrintf ("%s: Imported %u external method definitions\n", - Gbl_ExternalRefFilename, ImportCount); + AslGbl_ExternalRefFilename, ImportCount); } fclose (ExternalRefFile); @@ -1394,12 +1394,12 @@ AcpiDmEmitExternals ( AcpiDmUnresolvedWarning (1); - if (Gbl_ExternalRefFilename) + if (AslGbl_ExternalRefFilename) { AcpiOsPrintf ( " /*\n * External declarations were imported from\n" " * a reference file -- %s\n */\n\n", - Gbl_ExternalRefFilename); + AslGbl_ExternalRefFilename); } /* Modified: head/sys/contrib/dev/acpica/common/dmtable.c ============================================================================== --- head/sys/contrib/dev/acpica/common/dmtable.c Tue Oct 9 18:35:45 2018 (r339261) +++ head/sys/contrib/dev/acpica/common/dmtable.c Tue Oct 9 18:40:36 2018 (r339262) @@ -637,7 +637,7 @@ AcpiDmDumpDataTable ( if (AcpiUtIsAmlTable (Table)) { - if (Gbl_VerboseTemplates) + if (AslGbl_VerboseTemplates) { /* Dump the raw table data */ @@ -732,7 +732,7 @@ AcpiDmDumpDataTable ( } } - if (!Gbl_DoTemplates || Gbl_VerboseTemplates) + if (!AslGbl_DoTemplates || AslGbl_VerboseTemplates) { /* Dump the raw table data */ @@ -774,7 +774,7 @@ AcpiDmLineHeader ( Name = ""; } - if (Gbl_DoTemplates && !Gbl_VerboseTemplates) /* Terse template */ + if (AslGbl_DoTemplates && !AslGbl_VerboseTemplates) /* Terse template */ { if (ByteLength) { @@ -821,7 +821,7 @@ AcpiDmLineHeader2 ( UINT32 Value) { - if (Gbl_DoTemplates && !Gbl_VerboseTemplates) /* Terse template */ + if (AslGbl_DoTemplates && !AslGbl_VerboseTemplates) /* Terse template */ { if (ByteLength) { @@ -1232,9 +1232,9 @@ AcpiDmDumpTable ( /* Convert 16-byte UUID buffer to 36-byte formatted UUID string */ - (void) AuConvertUuidToString ((char *) Target, MsgBuffer); + (void) AuConvertUuidToString ((char *) Target, AslGbl_MsgBuffer); - AcpiOsPrintf ("%s\n", MsgBuffer); + AcpiOsPrintf ("%s\n", AslGbl_MsgBuffer); break; case ACPI_DMT_STRING: Modified: head/sys/contrib/dev/acpica/compiler/aslallocate.c ============================================================================== --- head/sys/contrib/dev/acpica/compiler/aslallocate.c Tue Oct 9 18:35:45 2018 (r339261) +++ head/sys/contrib/dev/acpica/compiler/aslallocate.c Tue Oct 9 18:40:36 2018 (r339262) @@ -186,16 +186,16 @@ UtLocalCalloc ( if (!Allocated) { AslCommonError (ASL_ERROR, ASL_MSG_MEMORY_ALLOCATION, - Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, - Gbl_InputByteCount, Gbl_CurrentColumn, - Gbl_Files[ASL_FILE_INPUT].Filename, NULL); + AslGbl_CurrentLineNumber, AslGbl_LogicalLineNumber, + AslGbl_InputByteCount, AslGbl_CurrentColumn, + AslGbl_Files[ASL_FILE_INPUT].Filename, NULL); CmCleanupAndExit (); exit (1); } - TotalAllocations++; - TotalAllocated += Size; + AslGbl_TotalAllocations++; + AslGbl_TotalAllocated += Size; return (Allocated); } @@ -209,7 +209,7 @@ UtLocalCalloc ( * RETURN: None. Reallocates the global line buffers * * DESCRIPTION: Called if the current line buffer becomes filled. Reallocates - * all global line buffers and updates Gbl_LineBufferSize. NOTE: + * all global line buffers and updates AslGbl_LineBufferSize. NOTE: * Also used for the initial allocation of the buffers, when * all of the buffer pointers are NULL. Initial allocations are * of size ASL_DEFAULT_LINE_BUFFER_SIZE @@ -225,21 +225,21 @@ UtExpandLineBuffers ( /* Attempt to double the size of all line buffers */ - NewSize = Gbl_LineBufferSize * 2; - if (Gbl_CurrentLineBuffer) + NewSize = AslGbl_LineBufferSize * 2; + if (AslGbl_CurrentLineBuffer) { DbgPrint (ASL_DEBUG_OUTPUT, "Increasing line buffer size from %u to %u\n", - Gbl_LineBufferSize, NewSize); + AslGbl_LineBufferSize, NewSize); } - UtReallocLineBuffers (&Gbl_CurrentLineBuffer, Gbl_LineBufferSize, NewSize); - UtReallocLineBuffers (&Gbl_MainTokenBuffer, Gbl_LineBufferSize, NewSize); - UtReallocLineBuffers (&Gbl_MacroTokenBuffer, Gbl_LineBufferSize, NewSize); - UtReallocLineBuffers (&Gbl_ExpressionTokenBuffer, Gbl_LineBufferSize, NewSize); + UtReallocLineBuffers (&AslGbl_CurrentLineBuffer, AslGbl_LineBufferSize, NewSize); + UtReallocLineBuffers (&AslGbl_MainTokenBuffer, AslGbl_LineBufferSize, NewSize); + UtReallocLineBuffers (&AslGbl_MacroTokenBuffer, AslGbl_LineBufferSize, NewSize); + UtReallocLineBuffers (&AslGbl_ExpressionTokenBuffer, AslGbl_LineBufferSize, NewSize); - Gbl_LineBufPtr = Gbl_CurrentLineBuffer; - Gbl_LineBufferSize = NewSize; + AslGbl_LineBufPtr = AslGbl_CurrentLineBuffer; + AslGbl_LineBufferSize = NewSize; } @@ -296,8 +296,8 @@ UtFreeLineBuffers ( void) { - free (Gbl_CurrentLineBuffer); - free (Gbl_MainTokenBuffer); - free (Gbl_MacroTokenBuffer); - free (Gbl_ExpressionTokenBuffer); + free (AslGbl_CurrentLineBuffer); + free (AslGbl_MainTokenBuffer); + free (AslGbl_MacroTokenBuffer); + free (AslGbl_ExpressionTokenBuffer); } Modified: head/sys/contrib/dev/acpica/compiler/aslanalyze.c ============================================================================== --- head/sys/contrib/dev/acpica/compiler/aslanalyze.c Tue Oct 9 18:35:45 2018 (r339261) +++ head/sys/contrib/dev/acpica/compiler/aslanalyze.c Tue Oct 9 18:40:36 2018 (r339262) @@ -452,8 +452,8 @@ AnCheckMethodReturnValue ( { /* Method returns a value, but the type is wrong */ - AnFormatBtype (StringBuffer, ThisNodeBtype); - AnFormatBtype (StringBuffer2, RequiredBtypes); + AnFormatBtype (AslGbl_StringBuffer, ThisNodeBtype); + AnFormatBtype (AslGbl_StringBuffer2, RequiredBtypes); /* * The case where the method does not return any value at all @@ -463,11 +463,11 @@ AnCheckMethodReturnValue ( */ if (ThisNodeBtype != 0) { - sprintf (MsgBuffer, + sprintf (AslGbl_MsgBuffer, "Method returns [%s], %s operator requires [%s]", - StringBuffer, OpInfo->Name, StringBuffer2); + AslGbl_StringBuffer, OpInfo->Name, AslGbl_StringBuffer2); - AslError (ASL_ERROR, ASL_MSG_INVALID_TYPE, ArgOp, MsgBuffer); + AslError (ASL_ERROR, ASL_MSG_INVALID_TYPE, ArgOp, AslGbl_MsgBuffer); } } } Modified: head/sys/contrib/dev/acpica/compiler/aslcache.c ============================================================================== --- head/sys/contrib/dev/acpica/compiler/aslcache.c Tue Oct 9 18:35:45 2018 (r339261) +++ head/sys/contrib/dev/acpica/compiler/aslcache.c Tue Oct 9 18:40:36 2018 (r339262) @@ -187,25 +187,25 @@ UtLocalCacheCalloc ( { CacheSize = Length; - if (Gbl_StringCacheList) + if (AslGbl_StringCacheList) { Cache = UtLocalCalloc (sizeof (Cache->Next) + CacheSize); /* Link new cache buffer just following head of list */ - Cache->Next = Gbl_StringCacheList->Next; - Gbl_StringCacheList->Next = Cache; + Cache->Next = AslGbl_StringCacheList->Next; + AslGbl_StringCacheList->Next = Cache; /* Leave cache management pointers alone as they pertain to head */ - Gbl_StringCount++; - Gbl_StringSize += Length; + AslGbl_StringCount++; + AslGbl_StringSize += Length; return (Cache->Buffer); } } - if ((Gbl_StringCacheNext + Length) >= Gbl_StringCacheLast) + if ((AslGbl_StringCacheNext + Length) >= AslGbl_StringCacheLast) { /* Allocate a new buffer */ @@ -213,20 +213,20 @@ UtLocalCacheCalloc ( /* Link new cache buffer to head of list */ - Cache->Next = Gbl_StringCacheList; - Gbl_StringCacheList = Cache; + Cache->Next = AslGbl_StringCacheList; + AslGbl_StringCacheList = Cache; /* Setup cache management pointers */ - Gbl_StringCacheNext = Cache->Buffer; - Gbl_StringCacheLast = Gbl_StringCacheNext + CacheSize; + AslGbl_StringCacheNext = Cache->Buffer; + AslGbl_StringCacheLast = AslGbl_StringCacheNext + CacheSize; } - Gbl_StringCount++; - Gbl_StringSize += Length; + AslGbl_StringCount++; + AslGbl_StringSize += Length; - Buffer = Gbl_StringCacheNext; - Gbl_StringCacheNext += Length; + Buffer = AslGbl_StringCacheNext; + AslGbl_StringCacheNext += Length; return (Buffer); } @@ -252,7 +252,7 @@ UtParseOpCacheCalloc ( ASL_CACHE_INFO *Cache; - if (Gbl_ParseOpCacheNext >= Gbl_ParseOpCacheLast) + if (AslGbl_ParseOpCacheNext >= AslGbl_ParseOpCacheLast) { /* Allocate a new buffer */ @@ -261,17 +261,17 @@ UtParseOpCacheCalloc ( /* Link new cache buffer to head of list */ - Cache->Next = Gbl_ParseOpCacheList; - Gbl_ParseOpCacheList = Cache; + Cache->Next = AslGbl_ParseOpCacheList; + AslGbl_ParseOpCacheList = Cache; /* Setup cache management pointers */ - Gbl_ParseOpCacheNext = ACPI_CAST_PTR (ACPI_PARSE_OBJECT, Cache->Buffer); - Gbl_ParseOpCacheLast = Gbl_ParseOpCacheNext + ASL_PARSEOP_CACHE_SIZE; + AslGbl_ParseOpCacheNext = ACPI_CAST_PTR (ACPI_PARSE_OBJECT, Cache->Buffer); + AslGbl_ParseOpCacheLast = AslGbl_ParseOpCacheNext + ASL_PARSEOP_CACHE_SIZE; } - Gbl_ParseOpCount++; - return (Gbl_ParseOpCacheNext++); + AslGbl_ParseOpCount++; + return (AslGbl_ParseOpCacheNext++); } @@ -296,7 +296,7 @@ UtSubtableCacheCalloc ( ASL_CACHE_INFO *Cache; - if (Gbl_SubtableCacheNext >= Gbl_SubtableCacheLast) + if (AslGbl_SubtableCacheNext >= AslGbl_SubtableCacheLast) { /* Allocate a new buffer */ @@ -305,17 +305,17 @@ UtSubtableCacheCalloc ( /* Link new cache buffer to head of list */ - Cache->Next = Gbl_SubtableCacheList; - Gbl_SubtableCacheList = Cache; + Cache->Next = AslGbl_SubtableCacheList; + AslGbl_SubtableCacheList = Cache; /* Setup cache management pointers */ - Gbl_SubtableCacheNext = ACPI_CAST_PTR (DT_SUBTABLE, Cache->Buffer); - Gbl_SubtableCacheLast = Gbl_SubtableCacheNext + ASL_SUBTABLE_CACHE_SIZE; + AslGbl_SubtableCacheNext = ACPI_CAST_PTR (DT_SUBTABLE, Cache->Buffer); + AslGbl_SubtableCacheLast = AslGbl_SubtableCacheNext + ASL_SUBTABLE_CACHE_SIZE; } - Gbl_SubtableCount++; - return (Gbl_SubtableCacheNext++); + AslGbl_SubtableCount++; + return (AslGbl_SubtableCacheNext++); } @@ -340,7 +340,7 @@ UtFieldCacheCalloc ( ASL_CACHE_INFO *Cache; - if (Gbl_FieldCacheNext >= Gbl_FieldCacheLast) + if (AslGbl_FieldCacheNext >= AslGbl_FieldCacheLast) { /* Allocate a new buffer */ @@ -349,17 +349,17 @@ UtFieldCacheCalloc ( /* Link new cache buffer to head of list */ - Cache->Next = Gbl_FieldCacheList; - Gbl_FieldCacheList = Cache; + Cache->Next = AslGbl_FieldCacheList; + AslGbl_FieldCacheList = Cache; /* Setup cache management pointers */ - Gbl_FieldCacheNext = ACPI_CAST_PTR (DT_FIELD, Cache->Buffer); - Gbl_FieldCacheLast = Gbl_FieldCacheNext + ASL_FIELD_CACHE_SIZE; + AslGbl_FieldCacheNext = ACPI_CAST_PTR (DT_FIELD, Cache->Buffer); + AslGbl_FieldCacheLast =AslGbl_FieldCacheNext + ASL_FIELD_CACHE_SIZE; } - Gbl_FieldCount++; - return (Gbl_FieldCacheNext++); + AslGbl_FieldCount++; + return (AslGbl_FieldCacheNext++); } @@ -387,95 +387,92 @@ UtDeleteLocalCaches ( * Generic cache, arbitrary size allocations */ BufferCount = 0; - while (Gbl_StringCacheList) + while (AslGbl_StringCacheList) { - Next = Gbl_StringCacheList->Next; - ACPI_FREE (Gbl_StringCacheList); - Gbl_StringCacheList = Next; + Next = AslGbl_StringCacheList->Next; + ACPI_FREE (AslGbl_StringCacheList); + AslGbl_StringCacheList = Next; BufferCount++; } DbgPrint (ASL_DEBUG_OUTPUT, "%u Strings (%u bytes), Buffer size: %u bytes, %u Buffers\n", - Gbl_StringCount, Gbl_StringSize, ASL_STRING_CACHE_SIZE, BufferCount); + AslGbl_StringCount, AslGbl_StringSize, ASL_STRING_CACHE_SIZE, BufferCount); /* Reset cache globals */ - Gbl_StringSize = 0; - Gbl_StringCount = 0; - Gbl_StringCacheNext = NULL; - Gbl_StringCacheLast = NULL; + AslGbl_StringSize = 0; + AslGbl_StringCount = 0; + AslGbl_StringCacheNext = NULL; + AslGbl_StringCacheLast = NULL; - /* * Parse Op cache */ BufferCount = 0; - while (Gbl_ParseOpCacheList) + while (AslGbl_ParseOpCacheList) { - Next = Gbl_ParseOpCacheList->Next; - ACPI_FREE (Gbl_ParseOpCacheList); - Gbl_ParseOpCacheList = Next; + Next = AslGbl_ParseOpCacheList->Next; + ACPI_FREE (AslGbl_ParseOpCacheList); + AslGbl_ParseOpCacheList = Next; BufferCount++; } DbgPrint (ASL_DEBUG_OUTPUT, "%u ParseOps, Buffer size: %u ops (%u bytes), %u Buffers\n", - Gbl_ParseOpCount, ASL_PARSEOP_CACHE_SIZE, + AslGbl_ParseOpCount, ASL_PARSEOP_CACHE_SIZE, (sizeof (ACPI_PARSE_OBJECT) * ASL_PARSEOP_CACHE_SIZE), BufferCount); /* Reset cache globals */ - Gbl_ParseOpCount = 0; - Gbl_ParseOpCacheNext = NULL; - Gbl_ParseOpCacheLast = NULL; - Gbl_ParseTreeRoot = NULL; + AslGbl_ParseOpCount = 0; + AslGbl_ParseOpCacheNext = NULL; + AslGbl_ParseOpCacheLast = NULL; + AslGbl_ParseTreeRoot = NULL; - /* * Table Compiler - Field cache */ BufferCount = 0; - while (Gbl_FieldCacheList) + while (AslGbl_FieldCacheList) { - Next = Gbl_FieldCacheList->Next; - ACPI_FREE (Gbl_FieldCacheList); - Gbl_FieldCacheList = Next; + Next = AslGbl_FieldCacheList->Next; + ACPI_FREE (AslGbl_FieldCacheList); + AslGbl_FieldCacheList = Next; BufferCount++; } DbgPrint (ASL_DEBUG_OUTPUT, "%u Fields, Buffer size: %u fields (%u bytes), %u Buffers\n", - Gbl_FieldCount, ASL_FIELD_CACHE_SIZE, + AslGbl_FieldCount, ASL_FIELD_CACHE_SIZE, (sizeof (DT_FIELD) * ASL_FIELD_CACHE_SIZE), BufferCount); /* Reset cache globals */ - Gbl_FieldCount = 0; - Gbl_FieldCacheNext = NULL; - Gbl_FieldCacheLast = NULL; + AslGbl_FieldCount = 0; + AslGbl_FieldCacheNext = NULL; + AslGbl_FieldCacheLast = NULL; - /* * Table Compiler - Subtable cache */ BufferCount = 0; - while (Gbl_SubtableCacheList) + while (AslGbl_SubtableCacheList) { - Next = Gbl_SubtableCacheList->Next; - ACPI_FREE (Gbl_SubtableCacheList); - Gbl_SubtableCacheList = Next; + Next = AslGbl_SubtableCacheList->Next; + ACPI_FREE (AslGbl_SubtableCacheList); + AslGbl_SubtableCacheList = Next; BufferCount++; } DbgPrint (ASL_DEBUG_OUTPUT, "%u Subtables, Buffer size: %u subtables (%u bytes), %u Buffers\n", - Gbl_SubtableCount, ASL_SUBTABLE_CACHE_SIZE, + AslGbl_SubtableCount, ASL_SUBTABLE_CACHE_SIZE, (sizeof (DT_SUBTABLE) * ASL_SUBTABLE_CACHE_SIZE), BufferCount); /* Reset cache globals */ - Gbl_SubtableCount = 0; - Gbl_SubtableCacheNext = NULL; - Gbl_SubtableCacheLast = NULL; + AslGbl_SubtableCount = 0; + AslGbl_SubtableCacheNext = NULL; + AslGbl_SubtableCacheLast = NULL; } Modified: head/sys/contrib/dev/acpica/compiler/aslcodegen.c ============================================================================== --- head/sys/contrib/dev/acpica/compiler/aslcodegen.c Tue Oct 9 18:35:45 2018 (r339261) +++ head/sys/contrib/dev/acpica/compiler/aslcodegen.c Tue Oct 9 18:40:36 2018 (r339262) @@ -203,10 +203,10 @@ CgGenerateAmlOutput ( /* Generate the AML output file */ FlSeekFile (ASL_FILE_SOURCE_OUTPUT, 0); - Gbl_SourceLine = 0; - Gbl_NextError = Gbl_ErrorLog; + AslGbl_SourceLine = 0; + AslGbl_NextError = AslGbl_ErrorLog; - TrWalkParseTree (Gbl_ParseTreeRoot, ASL_WALK_VISIT_DOWNWARD, + TrWalkParseTree (AslGbl_ParseTreeRoot, ASL_WALK_VISIT_DOWNWARD, CgAmlWriteWalk, NULL, NULL); DbgPrint (ASL_TREE_OUTPUT, ASL_PARSE_TREE_HEADER2); @@ -237,7 +237,7 @@ CgAmlWriteWalk ( CgWriteNode (Op); - if (!Gbl_DebugFlag) + if (!AslGbl_DebugFlag) { return (AE_OK); } @@ -556,46 +556,46 @@ CgWriteTableHeader ( Child->Asl.Value.String = ACPI_SIG_XXXX; } - strncpy (TableHeader.Signature, Child->Asl.Value.String, ACPI_NAME_SIZE); + strncpy (AslGbl_TableHeader.Signature, Child->Asl.Value.String, ACPI_NAME_SIZE); /* Revision */ Child = Child->Asl.Next; - TableHeader.Revision = (UINT8) Child->Asl.Value.Integer; + AslGbl_TableHeader.Revision = (UINT8) Child->Asl.Value.Integer; /* Command-line Revision override */ - if (Gbl_RevisionOverride) + if (AslGbl_RevisionOverride) { - TableHeader.Revision = Gbl_RevisionOverride; + AslGbl_TableHeader.Revision = AslGbl_RevisionOverride; } /* OEMID */ Child = Child->Asl.Next; - strncpy (TableHeader.OemId, Child->Asl.Value.String, ACPI_OEM_ID_SIZE); + strncpy (AslGbl_TableHeader.OemId, Child->Asl.Value.String, ACPI_OEM_ID_SIZE); /* OEM TableID */ Child = Child->Asl.Next; - strncpy (TableHeader.OemTableId, Child->Asl.Value.String, ACPI_OEM_TABLE_ID_SIZE); + strncpy (AslGbl_TableHeader.OemTableId, Child->Asl.Value.String, ACPI_OEM_TABLE_ID_SIZE); /* OEM Revision */ Child = Child->Asl.Next; - TableHeader.OemRevision = (UINT32) Child->Asl.Value.Integer; + AslGbl_TableHeader.OemRevision = (UINT32) Child->Asl.Value.Integer; /* Compiler ID */ - ACPI_MOVE_NAME (TableHeader.AslCompilerId, ASL_CREATOR_ID); + ACPI_MOVE_NAME (AslGbl_TableHeader.AslCompilerId, ASL_CREATOR_ID); /* Compiler version */ - TableHeader.AslCompilerRevision = ACPI_CA_VERSION; + AslGbl_TableHeader.AslCompilerRevision = ACPI_CA_VERSION; /* Table length. Checksum zero for now, will rewrite later */ - TableHeader.Length = sizeof (ACPI_TABLE_HEADER) + + AslGbl_TableHeader.Length = sizeof (ACPI_TABLE_HEADER) + Op->Asl.AmlSubtreeLength; /* Calculate the comment lengths for this definition block parseOp */ @@ -609,13 +609,15 @@ CgWriteTableHeader ( * Take the filename without extensions, add 3 for the new extension * and another 3 for the a908 bytecode and null terminator. */ - TableHeader.Length += strrchr (Gbl_ParseTreeRoot->Asl.Filename, '.') - - Gbl_ParseTreeRoot->Asl.Filename + 1 + 3 + 3; + AslGbl_TableHeader.Length += strrchr (AslGbl_ParseTreeRoot->Asl.Filename, '.') + - AslGbl_ParseTreeRoot->Asl.Filename + 1 + 3 + 3; + Op->Asl.AmlSubtreeLength += - strlen (Gbl_ParseTreeRoot->Asl.Filename) + 3; - CvDbgPrint (" Length: %lu\n", - strlen (Gbl_ParseTreeRoot->Asl.Filename) + 3); + strlen (AslGbl_ParseTreeRoot->Asl.Filename) + 3; + CvDbgPrint (" Length: %lu\n", + strlen (AslGbl_ParseTreeRoot->Asl.Filename) + 3); + if (Op->Asl.CommentList) { Current = Op->Asl.CommentList; @@ -624,10 +626,10 @@ CgWriteTableHeader ( CommentLength = strlen (Current->Comment)+3; CvDbgPrint ("Length of standard comment): %d\n", CommentLength); CvDbgPrint (" Comment string: %s\n\n", Current->Comment); - TableHeader.Length += CommentLength; + AslGbl_TableHeader.Length += CommentLength; Op->Asl.AmlSubtreeLength += CommentLength; Current = Current->Next; - CvDbgPrint (" Length: %u\n", CommentLength); + CvDbgPrint (" Length: %u\n", CommentLength); } } if (Op->Asl.CloseBraceComment) @@ -635,20 +637,19 @@ CgWriteTableHeader ( CommentLength = strlen (Op->Asl.CloseBraceComment)+3; CvDbgPrint ("Length of inline comment +3: %d\n", CommentLength); CvDbgPrint (" Comment string: %s\n\n", Op->Asl.CloseBraceComment); - TableHeader.Length += CommentLength; + AslGbl_TableHeader.Length += CommentLength; Op->Asl.AmlSubtreeLength += CommentLength; - CvDbgPrint (" Length: %u\n", CommentLength); + CvDbgPrint (" Length: %u\n", CommentLength); } } - TableHeader.Checksum = 0; + AslGbl_TableHeader.Checksum = 0; + Op->Asl.FinalAmlOffset = ftell (AslGbl_Files[ASL_FILE_AML_OUTPUT].Handle); - Op->Asl.FinalAmlOffset = ftell (Gbl_Files[ASL_FILE_AML_OUTPUT].Handle); - /* Write entire header and clear the table header global */ - CgLocalWriteAmlData (Op, &TableHeader, sizeof (ACPI_TABLE_HEADER)); - memset (&TableHeader, 0, sizeof (ACPI_TABLE_HEADER)); + CgLocalWriteAmlData (Op, &AslGbl_TableHeader, sizeof (ACPI_TABLE_HEADER)); + memset (&AslGbl_TableHeader, 0, sizeof (ACPI_TABLE_HEADER)); } @@ -727,7 +728,7 @@ CgCloseTable ( /* Process all definition blocks */ - Op = Gbl_ParseTreeRoot->Asl.Child; + Op = AslGbl_ParseTreeRoot->Asl.Child; while (Op) { CgUpdateHeader (Op); @@ -773,7 +774,7 @@ CgWriteNode ( } if ((Op->Asl.ParseOpcode == PARSEOP_EXTERNAL) && - Gbl_DoExternals == FALSE) + AslGbl_DoExternals == FALSE) { return; } Modified: head/sys/contrib/dev/acpica/compiler/aslcompile.c ============================================================================== --- head/sys/contrib/dev/acpica/compiler/aslcompile.c Tue Oct 9 18:35:45 2018 (r339261) +++ head/sys/contrib/dev/acpica/compiler/aslcompile.c Tue Oct 9 18:40:36 2018 (r339262) @@ -205,7 +205,7 @@ CmDoCompile ( UtEndEvent (Event); Event = UtBeginEvent ("Preprocess input file"); - if (Gbl_PreprocessFlag) + if (AslGbl_PreprocessFlag) { /* Enter compiler name as a #define */ @@ -214,10 +214,10 @@ CmDoCompile ( /* Preprocessor */ PrDoPreprocess (); - Gbl_CurrentLineNumber = 1; - Gbl_LogicalLineNumber = 1; + AslGbl_CurrentLineNumber = 1; + AslGbl_LogicalLineNumber = 1; - if (Gbl_PreprocessOnly) + if (AslGbl_PreprocessOnly) { UtEndEvent (Event); CmCleanupAndExit (); @@ -235,7 +235,7 @@ CmDoCompile ( /* Check for parser-detected syntax errors */ - if (Gbl_SyntaxError) + if (AslGbl_SyntaxError) { fprintf (stderr, "Compiler aborting due to parser-detected syntax error(s)\n"); @@ -245,7 +245,7 @@ CmDoCompile ( /* Did the parse tree get successfully constructed? */ - if (!Gbl_ParseTreeRoot) + if (!AslGbl_ParseTreeRoot) { /* * If there are no errors, then we have some sort of @@ -264,23 +264,23 @@ CmDoCompile ( /* Prune the parse tree if requested (debug purposes only) */ - if (Gbl_PruneParseTree) + if (AslGbl_PruneParseTree) { - AslPruneParseTree (Gbl_PruneDepth, Gbl_PruneType); + AslPruneParseTree (AslGbl_PruneDepth, AslGbl_PruneType); } /* Optional parse tree dump, compiler debug output only */ LsDumpParseTree (); - OpcGetIntegerWidth (Gbl_ParseTreeRoot->Asl.Child); + OpcGetIntegerWidth (AslGbl_ParseTreeRoot->Asl.Child); UtEndEvent (Event); /* Pre-process parse tree for any operator transforms */ Event = UtBeginEvent ("Parse tree transforms"); DbgPrint (ASL_DEBUG_OUTPUT, "\nParse tree transforms\n\n"); - TrWalkParseTree (Gbl_ParseTreeRoot, ASL_WALK_VISIT_TWICE, + TrWalkParseTree (AslGbl_ParseTreeRoot, ASL_WALK_VISIT_TWICE, TrAmlTransformWalkBegin, TrAmlTransformWalkEnd, NULL); UtEndEvent (Event); @@ -288,7 +288,7 @@ CmDoCompile ( Event = UtBeginEvent ("Generate AML opcodes"); DbgPrint (ASL_DEBUG_OUTPUT, "Generating AML opcodes\n\n"); - TrWalkParseTree (Gbl_ParseTreeRoot, ASL_WALK_VISIT_UPWARD, NULL, + TrWalkParseTree (AslGbl_ParseTreeRoot, ASL_WALK_VISIT_UPWARD, NULL, OpcAmlOpcodeWalk, NULL); UtEndEvent (Event); @@ -298,7 +298,7 @@ CmDoCompile ( * descriptor within the input file. */ Event = UtBeginEvent ("Open AML output file"); - Status = FlOpenAmlOutputFile (Gbl_OutputFilenamePrefix); + Status = FlOpenAmlOutputFile (AslGbl_OutputFilenamePrefix); UtEndEvent (Event); if (ACPI_FAILURE (Status)) { @@ -312,9 +312,9 @@ CmDoCompile ( DbgPrint (ASL_DEBUG_OUTPUT, "Interpreting compile-time constant expressions\n\n"); - if (Gbl_FoldConstants) + if (AslGbl_FoldConstants) { - TrWalkParseTree (Gbl_ParseTreeRoot, ASL_WALK_VISIT_UPWARD, + TrWalkParseTree (AslGbl_ParseTreeRoot, ASL_WALK_VISIT_UPWARD, NULL, OpcAmlConstantWalk, NULL); } else @@ -328,7 +328,7 @@ CmDoCompile ( Event = UtBeginEvent ("Updating AML opcodes after constant folding"); DbgPrint (ASL_DEBUG_OUTPUT, "Updating AML opcodes after constant folding\n\n"); - TrWalkParseTree (Gbl_ParseTreeRoot, ASL_WALK_VISIT_UPWARD, + TrWalkParseTree (AslGbl_ParseTreeRoot, ASL_WALK_VISIT_UPWARD, NULL, OpcAmlOpcodeUpdateWalk, NULL); UtEndEvent (Event); @@ -336,15 +336,15 @@ CmDoCompile ( Event = UtBeginEvent ("Generate AML package lengths"); DbgPrint (ASL_DEBUG_OUTPUT, "Generating Package lengths\n\n"); - TrWalkParseTree (Gbl_ParseTreeRoot, ASL_WALK_VISIT_UPWARD, NULL, + TrWalkParseTree (AslGbl_ParseTreeRoot, ASL_WALK_VISIT_UPWARD, NULL, LnPackageLengthWalk, NULL); UtEndEvent (Event); - if (Gbl_ParseOnlyFlag) + if (AslGbl_ParseOnlyFlag) { AePrintErrorLog (ASL_FILE_STDERR); UtDisplaySummary (ASL_FILE_STDERR); - if (Gbl_DebugFlag) + if (AslGbl_DebugFlag) { /* Print error summary to the stdout also */ @@ -363,7 +363,7 @@ CmDoCompile ( Event = UtBeginEvent ("Create ACPI Namespace"); DbgPrint (ASL_DEBUG_OUTPUT, "Creating ACPI Namespace\n\n"); - Status = LdLoadNamespace (Gbl_ParseTreeRoot); + Status = LdLoadNamespace (AslGbl_ParseTreeRoot); UtEndEvent (Event); if (ACPI_FAILURE (Status)) { @@ -388,19 +388,19 @@ CmDoCompile ( /* Resolve External Declarations */ - if (Gbl_DoExternals) + if (AslGbl_DoExternals) { *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@freebsd.org Tue Oct 9 18:57:57 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 932E110B877C; Tue, 9 Oct 2018 18:57:57 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mail.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 36B19776D2; Tue, 9 Oct 2018 18:57:57 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-2.local (ralph.baldwin.cx [66.234.199.215]) by mail.baldwin.cx (Postfix) with ESMTPSA id 12C2D10B707; Tue, 9 Oct 2018 14:57:54 -0400 (EDT) Subject: Re: svn commit: r339251 - in head/sys: net netinet netinet6 To: "Jonathan T. Looney" References: <201810091326.w99DQ7MN083891@repo.freebsd.org> Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org From: John Baldwin Message-ID: Date: Tue, 9 Oct 2018 11:57:53 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mail.baldwin.cx); Tue, 09 Oct 2018 14:57:56 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx X-Virus-Status: Clean X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 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: Tue, 09 Oct 2018 18:57:57 -0000 On 10/9/18 8:36 AM, Jonathan T. Looney wrote: > On Tue, Oct 9, 2018 at 11:02 AM John Baldwin > wrote: > > Do we have some sort of simple per-thread epoch counter similar to > td->td_locks that we could assert on in userret() and in the ithread loop > when ithreads go to sleep to help catch leaked locks? > > > Yes: td->td_epochnest. > > There are already INVARIANTS checks in malloc (for M_WAITOK),  userret(), and _sleep(). I think that covers the cases you mentioned. However, I am very much in favor of adding any additional checks which make sense. The one that would matter in this case would be idle ithreads. We have some existing checks (WITNESS_WARN) in ithread_loop() already. We should add a td_epochnest assertion next to that line I think. -- John Baldwin                                                                              From owner-svn-src-head@freebsd.org Tue Oct 9 19:27:44 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 68F9710B96DD; Tue, 9 Oct 2018 19:27:44 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1A3477889A; Tue, 9 Oct 2018 19:27:44 +0000 (UTC) (envelope-from des@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 09CC9167BF; Tue, 9 Oct 2018 19:27:44 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w99JRhvI071033; Tue, 9 Oct 2018 19:27:43 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w99JRgeR071028; Tue, 9 Oct 2018 19:27:42 GMT (envelope-from des@FreeBSD.org) Message-Id: <201810091927.w99JRgeR071028@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Tue, 9 Oct 2018 19:27:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339263 - head/crypto/openssh X-SVN-Group: head X-SVN-Commit-Author: des X-SVN-Commit-Paths: head/crypto/openssh X-SVN-Commit-Revision: 339263 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.27 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: Tue, 09 Oct 2018 19:27:44 -0000 Author: des Date: Tue Oct 9 19:27:42 2018 New Revision: 339263 URL: https://svnweb.freebsd.org/changeset/base/339263 Log: Fix portability issues with the Capsicum patch committed in r339216: - Wrap access to pw_change and pw_expire in the appropriate #ifdefs. - Wrap calls to login_cap(3) API in appropriate #ifdefs. - Add wrapper for transferring time_t, which is still only 32 bits wide on FreeBSD i386. - Use a temporary variable to deserialize size_t. Approved by: re (gjb) Modified: head/crypto/openssh/monitor.c head/crypto/openssh/monitor_wrap.c head/crypto/openssh/monitor_wrap.h head/crypto/openssh/sshbuf-getput-basic.c head/crypto/openssh/sshbuf.h Modified: head/crypto/openssh/monitor.c ============================================================================== --- head/crypto/openssh/monitor.c Tue Oct 9 18:40:36 2018 (r339262) +++ head/crypto/openssh/monitor.c Tue Oct 9 19:27:42 2018 (r339263) @@ -114,7 +114,9 @@ static struct sshbuf *child_state; int mm_answer_moduli(int, struct sshbuf *); int mm_answer_sign(int, struct sshbuf *); +#ifdef HAVE_LOGIN_CAP int mm_answer_login_getpwclass(int, struct sshbuf *); +#endif int mm_answer_pwnamallow(int, struct sshbuf *); int mm_answer_auth2_read_banner(int, struct sshbuf *); int mm_answer_authserv(int, struct sshbuf *); @@ -190,7 +192,9 @@ struct mon_table mon_dispatch_proto20[] = { {MONITOR_REQ_MODULI, MON_ONCE, mm_answer_moduli}, #endif {MONITOR_REQ_SIGN, MON_ONCE, mm_answer_sign}, +#ifdef HAVE_LOGIN_CAP {MONITOR_REQ_GETPWCLASS, MON_AUTH, mm_answer_login_getpwclass}, +#endif {MONITOR_REQ_PWNAM, MON_ONCE, mm_answer_pwnamallow}, {MONITOR_REQ_AUTHSERV, MON_ONCE, mm_answer_authserv}, {MONITOR_REQ_AUTH2_READ_BANNER, MON_ONCE, mm_answer_auth2_read_banner}, @@ -709,6 +713,7 @@ mm_answer_sign(int sock, struct sshbuf *m) return (0); } +#ifdef HAVE_LOGIN_CAP int mm_answer_login_getpwclass(int sock, struct sshbuf *m) { @@ -748,6 +753,7 @@ mm_answer_login_getpwclass(int sock, struct sshbuf *m) return (0); } +#endif /* Retrieves the password entry and also checks if the user is permitted */ Modified: head/crypto/openssh/monitor_wrap.c ============================================================================== --- head/crypto/openssh/monitor_wrap.c Tue Oct 9 18:40:36 2018 (r339262) +++ head/crypto/openssh/monitor_wrap.c Tue Oct 9 19:27:42 2018 (r339263) @@ -247,6 +247,7 @@ mm_sshkey_sign(struct sshkey *key, u_char **sigp, size return (0); } +#ifdef HAVE_LOGIN_CAP login_cap_t * mm_login_getpwclass(const struct passwd *pwent) { @@ -286,7 +287,9 @@ mm_login_getpwclass(const struct passwd *pwent) return (lc); } +#endif +#ifdef HAVE_LOGIN_CAP void mm_login_close(login_cap_t *lc) { @@ -297,6 +300,7 @@ mm_login_close(login_cap_t *lc) free(lc->lc_cap); free(lc); } +#endif struct passwd * mm_getpwnamallow(const char *username) Modified: head/crypto/openssh/monitor_wrap.h ============================================================================== --- head/crypto/openssh/monitor_wrap.h Tue Oct 9 18:40:36 2018 (r339262) +++ head/crypto/openssh/monitor_wrap.h Tue Oct 9 19:27:42 2018 (r339263) @@ -28,8 +28,6 @@ #ifndef _MM_WRAP_H_ #define _MM_WRAP_H_ -#include - extern int use_privsep; #define PRIVSEP(x) (use_privsep ? mm_##x : x) @@ -46,9 +44,11 @@ DH *mm_choose_dh(int, int, int); int mm_sshkey_sign(struct sshkey *, u_char **, size_t *, const u_char *, size_t, const char *, u_int compat); void mm_inform_authserv(char *, char *); +#ifdef HAVE_LOGIN_CAP +struct login_cap *mm_login_getpwclass(const struct passwd *pwd); +void mm_login_close(struct login_cap *lc); +#endif struct passwd *mm_getpwnamallow(const char *); -login_cap_t *mm_login_getpwclass(const struct passwd *pwd); -void mm_login_close(login_cap_t *lc); char *mm_auth2_read_banner(void); int mm_auth_password(struct ssh *, char *); int mm_key_allowed(enum mm_keytype, const char *, const char *, struct sshkey *, Modified: head/crypto/openssh/sshbuf-getput-basic.c ============================================================================== --- head/crypto/openssh/sshbuf-getput-basic.c Tue Oct 9 18:40:36 2018 (r339262) +++ head/crypto/openssh/sshbuf-getput-basic.c Tue Oct 9 19:27:42 2018 (r339263) @@ -482,7 +482,9 @@ sshbuf_put_passwd(struct sshbuf *buf, const struct pas (r = sshbuf_put_cstring(buf, "*")) != 0 || (r = sshbuf_put_u32(buf, pwent->pw_uid)) != 0 || (r = sshbuf_put_u32(buf, pwent->pw_gid)) != 0 || - (r = sshbuf_put_u64(buf, pwent->pw_change)) != 0 || +#ifdef HAVE_STRUCT_PASSWD_PW_CHANGE + (r = sshbuf_put_time(buf, pwent->pw_change)) != 0 || +#endif #ifdef HAVE_STRUCT_PASSWD_PW_GECOS (r = sshbuf_put_cstring(buf, pwent->pw_gecos)) != 0 || #endif @@ -491,7 +493,9 @@ sshbuf_put_passwd(struct sshbuf *buf, const struct pas #endif (r = sshbuf_put_cstring(buf, pwent->pw_dir)) != 0 || (r = sshbuf_put_cstring(buf, pwent->pw_shell)) != 0 || - (r = sshbuf_put_u64(buf, pwent->pw_expire)) != 0 || +#ifdef HAVE_STRUCT_PASSWD_PW_EXPIRE + (r = sshbuf_put_time(buf, pwent->pw_expire)) != 0 || +#endif (r = sshbuf_put_u32(buf, pwent->pw_fields)) != 0) { return r; } @@ -505,8 +509,8 @@ struct passwd * sshbuf_get_passwd(struct sshbuf *buf) { struct passwd *pw; + u_int64_t len; int r; - size_t len; /* check if size of struct passwd is as same as sender's size */ r = sshbuf_get_u64(buf, &len); @@ -518,7 +522,9 @@ sshbuf_get_passwd(struct sshbuf *buf) sshbuf_get_cstring(buf, &pw->pw_passwd, NULL) != 0 || sshbuf_get_u32(buf, &pw->pw_uid) != 0 || sshbuf_get_u32(buf, &pw->pw_gid) != 0 || - sshbuf_get_u64(buf, &pw->pw_change) != 0 || +#ifdef HAVE_STRUCT_PASSWD_PW_CHANGE + sshbuf_get_time(buf, &pw->pw_change) != 0 || +#endif #ifdef HAVE_STRUCT_PASSWD_PW_GECOS sshbuf_get_cstring(buf, &pw->pw_gecos, NULL) != 0 || #endif @@ -527,7 +533,9 @@ sshbuf_get_passwd(struct sshbuf *buf) #endif sshbuf_get_cstring(buf, &pw->pw_dir, NULL) != 0 || sshbuf_get_cstring(buf, &pw->pw_shell, NULL) != 0 || - sshbuf_get_u64(buf, &pw->pw_expire) != 0 || +#ifdef HAVE_STRUCT_PASSWD_PW_EXPIRE + sshbuf_get_time(buf, &pw->pw_expire) != 0 || +#endif sshbuf_get_u32(buf, &pw->pw_fields) != 0) { sshbuf_free_passwd(pw); return NULL; Modified: head/crypto/openssh/sshbuf.h ============================================================================== --- head/crypto/openssh/sshbuf.h Tue Oct 9 18:40:36 2018 (r339262) +++ head/crypto/openssh/sshbuf.h Tue Oct 9 19:27:42 2018 (r339263) @@ -21,7 +21,6 @@ #include #include #include -#include #ifdef WITH_OPENSSL # include # ifdef OPENSSL_HAS_ECC @@ -176,6 +175,14 @@ int sshbuf_put_u64(struct sshbuf *buf, u_int64_t val); int sshbuf_put_u32(struct sshbuf *buf, u_int32_t val); int sshbuf_put_u16(struct sshbuf *buf, u_int16_t val); int sshbuf_put_u8(struct sshbuf *buf, u_char val); + +#if defined(__FreeBSD__) && defined(__i386__) +#define sshbuf_get_time(b, vp) sshbuf_get_u32((b), (u_int32_t *)(vp)) +#define sshbuf_put_time(b, v) sshbuf_put_u32((b), (u_int32_t)(v)) +#else +#define sshbuf_get_time(b, vp) sshbuf_get_u64((b), (u_int64_t *)(vp)) +#define sshbuf_put_time(b, v) sshbuf_put_u64((b), (u_int64_t)(v)) +#endif /* * Functions to extract or store SSH wire encoded strings (u32 len || data) From owner-svn-src-head@freebsd.org Tue Oct 9 20:16:20 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9456F10BAD9C; Tue, 9 Oct 2018 20:16:20 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49D817AB07; Tue, 9 Oct 2018 20:16:20 +0000 (UTC) (envelope-from shurd@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4025016FE2; Tue, 9 Oct 2018 20:16:20 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w99KGJrB097038; Tue, 9 Oct 2018 20:16:19 GMT (envelope-from shurd@FreeBSD.org) Received: (from shurd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w99KGJX0097037; Tue, 9 Oct 2018 20:16:19 GMT (envelope-from shurd@FreeBSD.org) Message-Id: <201810092016.w99KGJX0097037@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: shurd set sender to shurd@FreeBSD.org using -f From: Stephen Hurd Date: Tue, 9 Oct 2018 20:16:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339267 - head/sys/dev/e1000 X-SVN-Group: head X-SVN-Commit-Author: shurd X-SVN-Commit-Paths: head/sys/dev/e1000 X-SVN-Commit-Revision: 339267 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.27 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: Tue, 09 Oct 2018 20:16:20 -0000 Author: shurd Date: Tue Oct 9 20:16:19 2018 New Revision: 339267 URL: https://svnweb.freebsd.org/changeset/base/339267 Log: Use mbuf defines to construct csum offload masks rather than literals Reviewed by: erj Approved by: re (rgrimes) Sponsored by: Limelight Networks Differential Revision: https://reviews.freebsd.org/D17442 Modified: head/sys/dev/e1000/if_em.h Modified: head/sys/dev/e1000/if_em.h ============================================================================== --- head/sys/dev/e1000/if_em.h Tue Oct 9 19:46:27 2018 (r339266) +++ head/sys/dev/e1000/if_em.h Tue Oct 9 20:16:19 2018 (r339267) @@ -341,8 +341,11 @@ #define EM_MSIX_LINK 0x01000000 /* For 82574 use */ #define ETH_ZLEN 60 #define ETH_ADDR_LEN 6 -#define EM_CSUM_OFFLOAD 7 /* Offload bits in mbuf flag */ -#define IGB_CSUM_OFFLOAD 0x0E0F /* Offload bits in mbuf flag */ +#define EM_CSUM_OFFLOAD (CSUM_IP | CSUM_IP_UDP | CSUM_IP_TCP) /* Offload bits in mbuf flag */ +#define IGB_CSUM_OFFLOAD (CSUM_IP | CSUM_IP_UDP | CSUM_IP_TCP | \ + CSUM_IP_SCTP | CSUM_IP6_UDP | CSUM_IP6_TCP | \ + CSUM_IP6_SCTP) /* Offload bits in mbuf flag */ + #define IGB_PKTTYPE_MASK 0x0000FFF0 #define IGB_DMCTLX_DCFLUSH_DIS 0x80000000 /* Disable DMA Coalesce Flush */ From owner-svn-src-head@freebsd.org Tue Oct 9 20:42:18 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BAFA910BC055; Tue, 9 Oct 2018 20:42:18 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6C85C7C063; Tue, 9 Oct 2018 20:42:18 +0000 (UTC) (envelope-from brooks@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 67373174BB; Tue, 9 Oct 2018 20:42:18 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w99KgI3U010739; Tue, 9 Oct 2018 20:42:18 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w99KgHMR010733; Tue, 9 Oct 2018 20:42:17 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201810092042.w99KgHMR010733@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Tue, 9 Oct 2018 20:42:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339269 - in head/sys: amd64/linux amd64/linux32 compat/cloudabi32 compat/cloudabi64 i386/linux X-SVN-Group: head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: in head/sys: amd64/linux amd64/linux32 compat/cloudabi32 compat/cloudabi64 i386/linux X-SVN-Commit-Revision: 339269 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.27 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: Tue, 09 Oct 2018 20:42:19 -0000 Author: brooks Date: Tue Oct 9 20:42:17 2018 New Revision: 339269 URL: https://svnweb.freebsd.org/changeset/base/339269 Log: Regenerated assorted syscall related files after: - r327895: Implement 'domainset'... - r329876: Use linux types for linux-specific syscalls Diff generated with: find . -name syscalls.conf | xargs dirname | \ xargs -n1 -I DIR make -C DIR sysent Approved by: re (kib) Sponsored by: DARPA, AFRL Modified: head/sys/amd64/linux/linux_proto.h head/sys/amd64/linux/linux_systrace_args.c head/sys/amd64/linux32/linux32_proto.h head/sys/compat/cloudabi32/cloudabi32_proto.h head/sys/compat/cloudabi64/cloudabi64_proto.h head/sys/i386/linux/linux_proto.h Modified: head/sys/amd64/linux/linux_proto.h ============================================================================== --- head/sys/amd64/linux/linux_proto.h Tue Oct 9 20:29:04 2018 (r339268) +++ head/sys/amd64/linux/linux_proto.h Tue Oct 9 20:42:17 2018 (r339269) @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -66,8 +67,8 @@ struct linux_mmap2_args { }; struct linux_mprotect_args { char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)]; - char len_l_[PADL_(int)]; int len; char len_r_[PADR_(int)]; - char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)]; + char len_l_[PADL_(l_int)]; l_int len; char len_r_[PADR_(l_int)]; + char prot_l_[PADL_(l_int)]; l_int prot; char prot_r_[PADR_(l_int)]; }; struct linux_brk_args { char dsend_l_[PADL_(l_ulong)]; l_ulong dsend; char dsend_r_[PADR_(l_ulong)]; @@ -173,8 +174,8 @@ struct linux_getpid_args { register_t dummy; }; struct linux_sendfile_args { - char out_l_[PADL_(int)]; int out; char out_r_[PADR_(int)]; - char in_l_[PADL_(int)]; int in; char in_r_[PADR_(int)]; + char out_l_[PADL_(l_int)]; l_int out; char out_r_[PADR_(l_int)]; + char in_l_[PADL_(l_int)]; l_int in; char in_r_[PADR_(l_int)]; char offset_l_[PADL_(l_long *)]; l_long * offset; char offset_r_[PADR_(l_long *)]; char count_l_[PADL_(l_size_t)]; l_size_t count; char count_r_[PADR_(l_size_t)]; }; @@ -281,7 +282,7 @@ struct linux_execve_args { char envp_l_[PADL_(char **)]; char ** envp; char envp_r_[PADR_(char **)]; }; struct linux_exit_args { - char rval_l_[PADL_(int)]; int rval; char rval_r_[PADR_(int)]; + char rval_l_[PADL_(l_int)]; l_int rval; char rval_r_[PADR_(l_int)]; }; struct linux_wait4_args { char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)]; @@ -518,8 +519,8 @@ struct linux_sysfs_args { char arg2_l_[PADL_(l_ulong)]; l_ulong arg2; char arg2_r_[PADR_(l_ulong)]; }; struct linux_getpriority_args { - char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)]; - char who_l_[PADL_(int)]; int who; char who_r_[PADR_(int)]; + char which_l_[PADL_(l_int)]; l_int which; char which_r_[PADR_(l_int)]; + char who_l_[PADL_(l_int)]; l_int who; char who_r_[PADR_(l_int)]; }; struct linux_sched_setparam_args { char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)]; @@ -654,19 +655,19 @@ struct linux_fremovexattr_args { register_t dummy; }; struct linux_tkill_args { - char tid_l_[PADL_(int)]; int tid; char tid_r_[PADR_(int)]; - char sig_l_[PADL_(int)]; int sig; char sig_r_[PADR_(int)]; + char tid_l_[PADL_(l_int)]; l_int tid; char tid_r_[PADR_(l_int)]; + char sig_l_[PADL_(l_int)]; l_int sig; char sig_r_[PADR_(l_int)]; }; struct linux_time_args { char tm_l_[PADL_(l_time_t *)]; l_time_t * tm; char tm_r_[PADR_(l_time_t *)]; }; struct linux_sys_futex_args { char uaddr_l_[PADL_(void *)]; void * uaddr; char uaddr_r_[PADR_(void *)]; - char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)]; - char val_l_[PADL_(int)]; int val; char val_r_[PADR_(int)]; + char op_l_[PADL_(l_int)]; l_int op; char op_r_[PADR_(l_int)]; + char val_l_[PADL_(l_int)]; l_int val; char val_r_[PADR_(l_int)]; char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)]; char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void *)]; - char val3_l_[PADL_(int)]; int val3; char val3_r_[PADR_(int)]; + char val3_l_[PADL_(l_int)]; l_int val3; char val3_r_[PADR_(l_int)]; }; struct linux_sched_setaffinity_args { char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)]; @@ -693,16 +694,16 @@ struct linux_getdents64_args { char count_l_[PADL_(l_uint)]; l_uint count; char count_r_[PADR_(l_uint)]; }; struct linux_set_tid_address_args { - char tidptr_l_[PADL_(int *)]; int * tidptr; char tidptr_r_[PADR_(int *)]; + char tidptr_l_[PADL_(l_int *)]; l_int * tidptr; char tidptr_r_[PADR_(l_int *)]; }; struct linux_semtimedop_args { register_t dummy; }; struct linux_fadvise64_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)]; char offset_l_[PADL_(l_loff_t)]; l_loff_t offset; char offset_r_[PADR_(l_loff_t)]; char len_l_[PADL_(l_size_t)]; l_size_t len; char len_r_[PADR_(l_size_t)]; - char advice_l_[PADL_(int)]; int advice; char advice_r_[PADR_(int)]; + char advice_l_[PADL_(l_int)]; l_int advice; char advice_r_[PADR_(l_int)]; }; struct linux_timer_create_args { char clock_id_l_[PADL_(clockid_t)]; clockid_t clock_id; char clock_id_r_[PADR_(clockid_t)]; @@ -744,7 +745,7 @@ struct linux_clock_nanosleep_args { char rmtp_l_[PADL_(struct l_timespec *)]; struct l_timespec * rmtp; char rmtp_r_[PADR_(struct l_timespec *)]; }; struct linux_exit_group_args { - char error_code_l_[PADL_(int)]; int error_code; char error_code_r_[PADR_(int)]; + char error_code_l_[PADL_(l_int)]; l_int error_code; char error_code_r_[PADR_(l_int)]; }; struct linux_epoll_wait_args { char epfd_l_[PADL_(l_int)]; l_int epfd; char epfd_r_[PADR_(l_int)]; @@ -759,9 +760,9 @@ struct linux_epoll_ctl_args { char event_l_[PADL_(struct epoll_event *)]; struct epoll_event * event; char event_r_[PADR_(struct epoll_event *)]; }; struct linux_tgkill_args { - char tgid_l_[PADL_(int)]; int tgid; char tgid_r_[PADR_(int)]; - char pid_l_[PADL_(int)]; int pid; char pid_r_[PADR_(int)]; - char sig_l_[PADL_(int)]; int sig; char sig_r_[PADR_(int)]; + char tgid_l_[PADL_(l_int)]; l_int tgid; char tgid_r_[PADR_(l_int)]; + char pid_l_[PADL_(l_int)]; l_int pid; char pid_r_[PADR_(l_int)]; + char sig_l_[PADL_(l_int)]; l_int sig; char sig_r_[PADR_(l_int)]; }; struct linux_utimes_args { char fname_l_[PADL_(char *)]; char * fname; char fname_r_[PADR_(char *)]; @@ -798,10 +799,10 @@ struct linux_kexec_load_args { register_t dummy; }; struct linux_waitid_args { - char idtype_l_[PADL_(int)]; int idtype; char idtype_r_[PADR_(int)]; + char idtype_l_[PADL_(l_int)]; l_int idtype; char idtype_r_[PADR_(l_int)]; char id_l_[PADL_(l_pid_t)]; l_pid_t id; char id_r_[PADR_(l_pid_t)]; char info_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * info; char info_r_[PADR_(l_siginfo_t *)]; - char options_l_[PADL_(int)]; int options; char options_r_[PADR_(int)]; + char options_l_[PADL_(l_int)]; l_int options; char options_r_[PADR_(l_int)]; char rusage_l_[PADL_(struct rusage *)]; struct rusage * rusage; char rusage_r_[PADR_(struct rusage *)]; }; struct linux_add_key_args { @@ -1512,6 +1513,13 @@ int linux_pkey_free(struct thread *, struct linux_pkey #define nosys linux_nosys #endif /* COMPAT_FREEBSD10 */ + + +#ifdef COMPAT_FREEBSD11 + +#define nosys linux_nosys + +#endif /* COMPAT_FREEBSD11 */ #define LINUX_SYS_AUE_linux_open AUE_OPEN_RWTC #define LINUX_SYS_AUE_linux_newstat AUE_STAT Modified: head/sys/amd64/linux/linux_systrace_args.c ============================================================================== --- head/sys/amd64/linux/linux_systrace_args.c Tue Oct 9 20:29:04 2018 (r339268) +++ head/sys/amd64/linux/linux_systrace_args.c Tue Oct 9 20:42:17 2018 (r339269) @@ -104,8 +104,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg case 10: { struct linux_mprotect_args *p = params; uarg[0] = (intptr_t) p->addr; /* caddr_t */ - iarg[1] = p->len; /* int */ - iarg[2] = p->prot; /* int */ + iarg[1] = p->len; /* l_int */ + iarg[2] = p->prot; /* l_int */ *n_args = 3; break; } @@ -354,8 +354,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg /* linux_sendfile */ case 40: { struct linux_sendfile_args *p = params; - iarg[0] = p->out; /* int */ - iarg[1] = p->in; /* int */ + iarg[0] = p->out; /* l_int */ + iarg[1] = p->in; /* l_int */ uarg[2] = (intptr_t) p->offset; /* l_long * */ iarg[3] = p->count; /* l_size_t */ *n_args = 4; @@ -538,7 +538,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg /* linux_exit */ case 60: { struct linux_exit_args *p = params; - iarg[0] = p->rval; /* int */ + iarg[0] = p->rval; /* l_int */ *n_args = 1; break; } @@ -1160,8 +1160,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg /* linux_getpriority */ case 140: { struct linux_getpriority_args *p = params; - iarg[0] = p->which; /* int */ - iarg[1] = p->who; /* int */ + iarg[0] = p->which; /* l_int */ + iarg[1] = p->who; /* l_int */ *n_args = 2; break; } @@ -1479,8 +1479,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg /* linux_tkill */ case 200: { struct linux_tkill_args *p = params; - iarg[0] = p->tid; /* int */ - iarg[1] = p->sig; /* int */ + iarg[0] = p->tid; /* l_int */ + iarg[1] = p->sig; /* l_int */ *n_args = 2; break; } @@ -1495,11 +1495,11 @@ systrace_args(int sysnum, void *params, uint64_t *uarg case 202: { struct linux_sys_futex_args *p = params; uarg[0] = (intptr_t) p->uaddr; /* void * */ - iarg[1] = p->op; /* int */ - iarg[2] = p->val; /* int */ + iarg[1] = p->op; /* l_int */ + iarg[2] = p->val; /* l_int */ uarg[3] = (intptr_t) p->timeout; /* struct l_timespec * */ uarg[4] = (intptr_t) p->uaddr2; /* void * */ - iarg[5] = p->val3; /* int */ + iarg[5] = p->val3; /* l_int */ *n_args = 6; break; } @@ -1550,7 +1550,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg /* linux_set_tid_address */ case 218: { struct linux_set_tid_address_args *p = params; - uarg[0] = (intptr_t) p->tidptr; /* int * */ + uarg[0] = (intptr_t) p->tidptr; /* l_int * */ *n_args = 1; break; } @@ -1562,10 +1562,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg /* linux_fadvise64 */ case 221: { struct linux_fadvise64_args *p = params; - iarg[0] = p->fd; /* int */ + iarg[0] = p->fd; /* l_int */ iarg[1] = p->offset; /* l_loff_t */ iarg[2] = p->len; /* l_size_t */ - iarg[3] = p->advice; /* int */ + iarg[3] = p->advice; /* l_int */ *n_args = 4; break; } @@ -1647,7 +1647,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg /* linux_exit_group */ case 231: { struct linux_exit_group_args *p = params; - iarg[0] = p->error_code; /* int */ + iarg[0] = p->error_code; /* l_int */ *n_args = 1; break; } @@ -1674,9 +1674,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg /* linux_tgkill */ case 234: { struct linux_tgkill_args *p = params; - iarg[0] = p->tgid; /* int */ - iarg[1] = p->pid; /* int */ - iarg[2] = p->sig; /* int */ + iarg[0] = p->tgid; /* l_int */ + iarg[1] = p->pid; /* l_int */ + iarg[2] = p->sig; /* l_int */ *n_args = 3; break; } @@ -1741,10 +1741,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg /* linux_waitid */ case 247: { struct linux_waitid_args *p = params; - iarg[0] = p->idtype; /* int */ + iarg[0] = p->idtype; /* l_int */ iarg[1] = p->id; /* l_pid_t */ uarg[2] = (intptr_t) p->info; /* l_siginfo_t * */ - iarg[3] = p->options; /* int */ + iarg[3] = p->options; /* l_int */ uarg[4] = (intptr_t) p->rusage; /* struct rusage * */ *n_args = 5; break; @@ -2619,10 +2619,10 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "caddr_t"; break; case 1: - p = "int"; + p = "l_int"; break; case 2: - p = "int"; + p = "l_int"; break; default: break; @@ -3036,10 +3036,10 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d case 40: switch(ndx) { case 0: - p = "int"; + p = "l_int"; break; case 1: - p = "int"; + p = "l_int"; break; case 2: p = "userland l_long *"; @@ -3366,7 +3366,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d case 60: switch(ndx) { case 0: - p = "int"; + p = "l_int"; break; default: break; @@ -4356,10 +4356,10 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d case 140: switch(ndx) { case 0: - p = "int"; + p = "l_int"; break; case 1: - p = "int"; + p = "l_int"; break; default: break; @@ -4763,10 +4763,10 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d case 200: switch(ndx) { case 0: - p = "int"; + p = "l_int"; break; case 1: - p = "int"; + p = "l_int"; break; default: break; @@ -4789,10 +4789,10 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "userland void *"; break; case 1: - p = "int"; + p = "l_int"; break; case 2: - p = "int"; + p = "l_int"; break; case 3: p = "userland struct l_timespec *"; @@ -4801,7 +4801,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "userland void *"; break; case 5: - p = "int"; + p = "l_int"; break; default: break; @@ -4875,7 +4875,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d case 218: switch(ndx) { case 0: - p = "userland int *"; + p = "userland l_int *"; break; default: break; @@ -4888,7 +4888,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d case 221: switch(ndx) { case 0: - p = "int"; + p = "l_int"; break; case 1: p = "l_loff_t"; @@ -4897,7 +4897,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "l_size_t"; break; case 3: - p = "int"; + p = "l_int"; break; default: break; @@ -5033,7 +5033,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d case 231: switch(ndx) { case 0: - p = "int"; + p = "l_int"; break; default: break; @@ -5081,13 +5081,13 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d case 234: switch(ndx) { case 0: - p = "int"; + p = "l_int"; break; case 1: - p = "int"; + p = "l_int"; break; case 2: - p = "int"; + p = "l_int"; break; default: break; @@ -5140,7 +5140,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d case 247: switch(ndx) { case 0: - p = "int"; + p = "l_int"; break; case 1: p = "l_pid_t"; @@ -5149,7 +5149,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "userland l_siginfo_t *"; break; case 3: - p = "int"; + p = "l_int"; break; case 4: p = "userland struct rusage *"; Modified: head/sys/amd64/linux32/linux32_proto.h ============================================================================== --- head/sys/amd64/linux32/linux32_proto.h Tue Oct 9 20:29:04 2018 (r339268) +++ head/sys/amd64/linux32/linux32_proto.h Tue Oct 9 20:42:17 2018 (r339269) @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -1706,6 +1707,13 @@ int linux_pkey_free(struct thread *, struct linux_pkey #define nosys linux_nosys #endif /* COMPAT_FREEBSD10 */ + + +#ifdef COMPAT_FREEBSD11 + +#define nosys linux_nosys + +#endif /* COMPAT_FREEBSD11 */ #define LINUX32_SYS_AUE_linux_exit AUE_EXIT #define LINUX32_SYS_AUE_linux_fork AUE_FORK Modified: head/sys/compat/cloudabi32/cloudabi32_proto.h ============================================================================== --- head/sys/compat/cloudabi32/cloudabi32_proto.h Tue Oct 9 20:29:04 2018 (r339268) +++ head/sys/compat/cloudabi32/cloudabi32_proto.h Tue Oct 9 20:42:17 2018 (r339269) @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include Modified: head/sys/compat/cloudabi64/cloudabi64_proto.h ============================================================================== --- head/sys/compat/cloudabi64/cloudabi64_proto.h Tue Oct 9 20:29:04 2018 (r339268) +++ head/sys/compat/cloudabi64/cloudabi64_proto.h Tue Oct 9 20:42:17 2018 (r339269) @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include Modified: head/sys/i386/linux/linux_proto.h ============================================================================== --- head/sys/i386/linux/linux_proto.h Tue Oct 9 20:29:04 2018 (r339268) +++ head/sys/i386/linux/linux_proto.h Tue Oct 9 20:42:17 2018 (r339269) @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -1726,6 +1727,13 @@ int linux_pkey_free(struct thread *, struct linux_pkey #define nosys linux_nosys #endif /* COMPAT_FREEBSD10 */ + + +#ifdef COMPAT_FREEBSD11 + +#define nosys linux_nosys + +#endif /* COMPAT_FREEBSD11 */ #define LINUX_SYS_AUE_linux_exit AUE_EXIT #define LINUX_SYS_AUE_linux_fork AUE_FORK From owner-svn-src-head@freebsd.org Tue Oct 9 21:28:33 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 70CDF10BE288; Tue, 9 Oct 2018 21:28:32 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2229B7F42F; Tue, 9 Oct 2018 21:28:32 +0000 (UTC) (envelope-from gjb@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1C47017B6F; Tue, 9 Oct 2018 21:28:32 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w99LSVMG035977; Tue, 9 Oct 2018 21:28:31 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w99LSR8Q035954; Tue, 9 Oct 2018 21:28:27 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201810092128.w99LSR8Q035954@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 9 Oct 2018 21:28:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339270 - in head: . contrib/bsnmp/lib contrib/dma contrib/ldns/ldns contrib/openbsm/bin/auditdistd contrib/telnet/libtelnet contrib/unbound crypto/heimdal/kdc crypto/heimdal/lib/gssapi... X-SVN-Group: head X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: in head: . contrib/bsnmp/lib contrib/dma contrib/ldns/ldns contrib/openbsm/bin/auditdistd contrib/telnet/libtelnet contrib/unbound crypto/heimdal/kdc crypto/heimdal/lib/gssapi/krb5 crypto/heimdal/lib/... X-SVN-Commit-Revision: 339270 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.27 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: Tue, 09 Oct 2018 21:28:33 -0000 Author: gjb Date: Tue Oct 9 21:28:26 2018 New Revision: 339270 URL: https://svnweb.freebsd.org/changeset/base/339270 Log: Merge the remainder of the projects/openssl111 branch to head. - Update OpenSSL to version 1.1.1. - Update Kerberos/Heimdal API for OpenSSL 1.1.1 compatibility. - Bump __FreeBSD_version. Approved by: re (kib) Sponsored by: The FreeBSD Foundation Added: head/crypto/openssl/ACKNOWLEDGEMENTS - copied unchanged from r339267, projects/openssl111/crypto/openssl/ACKNOWLEDGEMENTS head/crypto/openssl/AUTHORS - copied unchanged from r339267, projects/openssl111/crypto/openssl/AUTHORS head/crypto/openssl/NOTES.PERL - copied unchanged from r339267, projects/openssl111/crypto/openssl/NOTES.PERL head/crypto/openssl/NOTES.UNIX - copied unchanged from r339267, projects/openssl111/crypto/openssl/NOTES.UNIX head/crypto/openssl/README.FIPS - copied unchanged from r339267, projects/openssl111/crypto/openssl/README.FIPS head/crypto/openssl/apps/bf_prefix.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/apps/bf_prefix.c head/crypto/openssl/apps/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/apps/build.info head/crypto/openssl/apps/ct_log_list.cnf - copied unchanged from r339267, projects/openssl111/crypto/openssl/apps/ct_log_list.cnf head/crypto/openssl/apps/opt.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/apps/opt.c head/crypto/openssl/apps/rehash.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/apps/rehash.c head/crypto/openssl/apps/storeutl.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/apps/storeutl.c head/crypto/openssl/apps/tsget.in - copied unchanged from r339267, projects/openssl111/crypto/openssl/apps/tsget.in head/crypto/openssl/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/build.info head/crypto/openssl/crypto/aes/asm/aes-c64xplus.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/aes/asm/aes-c64xplus.pl head/crypto/openssl/crypto/aes/asm/aesfx-sparcv9.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/aes/asm/aesfx-sparcv9.pl head/crypto/openssl/crypto/aes/asm/vpaes-armv8.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/aes/asm/vpaes-armv8.pl head/crypto/openssl/crypto/aes/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/aes/build.info head/crypto/openssl/crypto/aria/ - copied from r339267, projects/openssl111/crypto/openssl/crypto/aria/ head/crypto/openssl/crypto/arm64cpuid.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/arm64cpuid.pl head/crypto/openssl/crypto/armv4cpuid.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/armv4cpuid.pl head/crypto/openssl/crypto/asn1/asn1_item_list.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/asn1/asn1_item_list.c head/crypto/openssl/crypto/asn1/asn1_item_list.h - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/asn1/asn1_item_list.h head/crypto/openssl/crypto/asn1/asn_mstbl.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/asn1/asn_mstbl.c head/crypto/openssl/crypto/asn1/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/asn1/build.info head/crypto/openssl/crypto/asn1/p5_scrypt.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/asn1/p5_scrypt.c head/crypto/openssl/crypto/asn1/standard_methods.h - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/asn1/standard_methods.h head/crypto/openssl/crypto/asn1/tasn_scn.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/asn1/tasn_scn.c head/crypto/openssl/crypto/asn1/tbl_standard.h - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/asn1/tbl_standard.h head/crypto/openssl/crypto/asn1/x_int64.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/asn1/x_int64.c head/crypto/openssl/crypto/async/ - copied from r339267, projects/openssl111/crypto/openssl/crypto/async/ head/crypto/openssl/crypto/bf/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/bf/build.info head/crypto/openssl/crypto/bio/b_addr.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/bio/b_addr.c head/crypto/openssl/crypto/bio/b_sock2.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/bio/b_sock2.c head/crypto/openssl/crypto/bio/bio_meth.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/bio/bio_meth.c head/crypto/openssl/crypto/bio/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/bio/build.info head/crypto/openssl/crypto/blake2/ - copied from r339267, projects/openssl111/crypto/openssl/crypto/blake2/ head/crypto/openssl/crypto/bn/README.pod - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/bn/README.pod head/crypto/openssl/crypto/bn/asm/armv8-mont.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/bn/asm/armv8-mont.pl head/crypto/openssl/crypto/bn/asm/bn-c64xplus.asm - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/bn/asm/bn-c64xplus.asm head/crypto/openssl/crypto/bn/asm/c64xplus-gf2m.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/bn/asm/c64xplus-gf2m.pl head/crypto/openssl/crypto/bn/bn_dh.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/bn/bn_dh.c head/crypto/openssl/crypto/bn/bn_intern.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/bn/bn_intern.c head/crypto/openssl/crypto/bn/bn_srp.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/bn/bn_srp.c head/crypto/openssl/crypto/bn/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/bn/build.info head/crypto/openssl/crypto/buffer/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/buffer/build.info head/crypto/openssl/crypto/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/build.info head/crypto/openssl/crypto/c64xpluscpuid.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/c64xpluscpuid.pl head/crypto/openssl/crypto/camellia/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/camellia/build.info head/crypto/openssl/crypto/cast/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/cast/build.info head/crypto/openssl/crypto/chacha/ - copied from r339267, projects/openssl111/crypto/openssl/crypto/chacha/ head/crypto/openssl/crypto/cmac/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/cmac/build.info head/crypto/openssl/crypto/cms/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/cms/build.info head/crypto/openssl/crypto/comp/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/comp/build.info head/crypto/openssl/crypto/comp/comp_lcl.h - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/comp/comp_lcl.h head/crypto/openssl/crypto/conf/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/conf/build.info head/crypto/openssl/crypto/conf/conf_lcl.h - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/conf/conf_lcl.h head/crypto/openssl/crypto/conf/conf_ssl.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/conf/conf_ssl.c head/crypto/openssl/crypto/ct/ - copied from r339267, projects/openssl111/crypto/openssl/crypto/ct/ head/crypto/openssl/crypto/ctype.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/ctype.c head/crypto/openssl/crypto/des/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/des/build.info head/crypto/openssl/crypto/dh/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/dh/build.info head/crypto/openssl/crypto/dh/dh_locl.h - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/dh/dh_locl.h head/crypto/openssl/crypto/dh/dh_meth.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/dh/dh_meth.c head/crypto/openssl/crypto/dh/dh_rfc7919.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/dh/dh_rfc7919.c head/crypto/openssl/crypto/dllmain.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/dllmain.c head/crypto/openssl/crypto/dsa/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/dsa/build.info head/crypto/openssl/crypto/dsa/dsa_meth.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/dsa/dsa_meth.c head/crypto/openssl/crypto/dso/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/dso/build.info head/crypto/openssl/crypto/dso/dso_locl.h - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/dso/dso_locl.h head/crypto/openssl/crypto/ec/asm/ecp_nistz256-armv4.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/ec/asm/ecp_nistz256-armv4.pl head/crypto/openssl/crypto/ec/asm/ecp_nistz256-armv8.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/ec/asm/ecp_nistz256-armv8.pl head/crypto/openssl/crypto/ec/asm/ecp_nistz256-ppc64.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/ec/asm/ecp_nistz256-ppc64.pl head/crypto/openssl/crypto/ec/asm/ecp_nistz256-sparcv9.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/ec/asm/ecp_nistz256-sparcv9.pl head/crypto/openssl/crypto/ec/asm/ecp_nistz256-x86.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/ec/asm/ecp_nistz256-x86.pl head/crypto/openssl/crypto/ec/asm/x25519-ppc64.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/ec/asm/x25519-ppc64.pl head/crypto/openssl/crypto/ec/asm/x25519-x86_64.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/ec/asm/x25519-x86_64.pl head/crypto/openssl/crypto/ec/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/ec/build.info head/crypto/openssl/crypto/ec/curve25519.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/ec/curve25519.c head/crypto/openssl/crypto/ec/curve448/ - copied from r339267, projects/openssl111/crypto/openssl/crypto/ec/curve448/ head/crypto/openssl/crypto/ec/ec_kmeth.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/ec/ec_kmeth.c head/crypto/openssl/crypto/ec/ecdh_kdf.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/ec/ecdh_kdf.c head/crypto/openssl/crypto/ec/ecdh_ossl.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/ec/ecdh_ossl.c head/crypto/openssl/crypto/ec/ecdsa_ossl.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/ec/ecdsa_ossl.c head/crypto/openssl/crypto/ec/ecdsa_sign.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/ec/ecdsa_sign.c head/crypto/openssl/crypto/ec/ecdsa_vrf.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/ec/ecdsa_vrf.c head/crypto/openssl/crypto/ec/ecx_meth.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/ec/ecx_meth.c head/crypto/openssl/crypto/engine/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/engine/build.info head/crypto/openssl/crypto/engine/eng_devcrypto.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/engine/eng_devcrypto.c head/crypto/openssl/crypto/engine/tb_eckey.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/engine/tb_eckey.c head/crypto/openssl/crypto/err/README - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/err/README head/crypto/openssl/crypto/err/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/err/build.info head/crypto/openssl/crypto/err/openssl.txt - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/err/openssl.txt head/crypto/openssl/crypto/evp/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/evp/build.info head/crypto/openssl/crypto/evp/cmeth_lib.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/evp/cmeth_lib.c head/crypto/openssl/crypto/evp/e_aria.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/evp/e_aria.c head/crypto/openssl/crypto/evp/e_chacha20_poly1305.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/evp/e_chacha20_poly1305.c head/crypto/openssl/crypto/evp/e_sm4.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/evp/e_sm4.c head/crypto/openssl/crypto/evp/m_md5_sha1.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/evp/m_md5_sha1.c head/crypto/openssl/crypto/evp/m_sha3.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/evp/m_sha3.c head/crypto/openssl/crypto/evp/pbe_scrypt.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/evp/pbe_scrypt.c head/crypto/openssl/crypto/hmac/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/hmac/build.info head/crypto/openssl/crypto/hmac/hmac_lcl.h - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/hmac/hmac_lcl.h head/crypto/openssl/crypto/idea/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/idea/build.info head/crypto/openssl/crypto/include/ - copied from r339267, projects/openssl111/crypto/openssl/crypto/include/ head/crypto/openssl/crypto/init.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/init.c head/crypto/openssl/crypto/kdf/ - copied from r339267, projects/openssl111/crypto/openssl/crypto/kdf/ head/crypto/openssl/crypto/lhash/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/lhash/build.info head/crypto/openssl/crypto/lhash/lhash_lcl.h - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/lhash/lhash_lcl.h head/crypto/openssl/crypto/md2/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/md2/build.info head/crypto/openssl/crypto/md4/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/md4/build.info head/crypto/openssl/crypto/md5/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/md5/build.info head/crypto/openssl/crypto/mdc2/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/mdc2/build.info head/crypto/openssl/crypto/mem_sec.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/mem_sec.c head/crypto/openssl/crypto/mips_arch.h - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/mips_arch.h head/crypto/openssl/crypto/modes/asm/ghash-c64xplus.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/modes/asm/ghash-c64xplus.pl head/crypto/openssl/crypto/modes/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/modes/build.info head/crypto/openssl/crypto/modes/ocb128.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/modes/ocb128.c head/crypto/openssl/crypto/o_fopen.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/o_fopen.c head/crypto/openssl/crypto/objects/README - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/objects/README head/crypto/openssl/crypto/objects/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/objects/build.info head/crypto/openssl/crypto/objects/obj_lcl.h - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/objects/obj_lcl.h head/crypto/openssl/crypto/ocsp/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/ocsp/build.info head/crypto/openssl/crypto/ocsp/ocsp_lcl.h - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/ocsp/ocsp_lcl.h head/crypto/openssl/crypto/ocsp/v3_ocsp.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/ocsp/v3_ocsp.c head/crypto/openssl/crypto/pem/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/pem/build.info head/crypto/openssl/crypto/perlasm/README - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/perlasm/README head/crypto/openssl/crypto/perlasm/arm-xlate.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/perlasm/arm-xlate.pl head/crypto/openssl/crypto/pkcs12/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/pkcs12/build.info head/crypto/openssl/crypto/pkcs12/p12_lcl.h - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/pkcs12/p12_lcl.h head/crypto/openssl/crypto/pkcs12/p12_sbag.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/pkcs12/p12_sbag.c head/crypto/openssl/crypto/pkcs7/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/pkcs7/build.info head/crypto/openssl/crypto/poly1305/ - copied from r339267, projects/openssl111/crypto/openssl/crypto/poly1305/ head/crypto/openssl/crypto/rand/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/rand/build.info head/crypto/openssl/crypto/rand/drbg_ctr.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/rand/drbg_ctr.c head/crypto/openssl/crypto/rand/drbg_lib.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/rand/drbg_lib.c head/crypto/openssl/crypto/rc2/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/rc2/build.info head/crypto/openssl/crypto/rc4/asm/rc4-c64xplus.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/rc4/asm/rc4-c64xplus.pl head/crypto/openssl/crypto/rc4/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/rc4/build.info head/crypto/openssl/crypto/rc5/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/rc5/build.info head/crypto/openssl/crypto/ripemd/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/ripemd/build.info head/crypto/openssl/crypto/rsa/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/rsa/build.info head/crypto/openssl/crypto/rsa/rsa_meth.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/rsa/rsa_meth.c head/crypto/openssl/crypto/rsa/rsa_mp.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/rsa/rsa_mp.c head/crypto/openssl/crypto/rsa/rsa_ossl.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/rsa/rsa_ossl.c head/crypto/openssl/crypto/rsa/rsa_x931g.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/rsa/rsa_x931g.c head/crypto/openssl/crypto/s390x_arch.h - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/s390x_arch.h head/crypto/openssl/crypto/s390xcpuid.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/s390xcpuid.pl head/crypto/openssl/crypto/seed/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/seed/build.info head/crypto/openssl/crypto/sha/asm/keccak1600-armv4.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/sha/asm/keccak1600-armv4.pl head/crypto/openssl/crypto/sha/asm/keccak1600-armv8.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/sha/asm/keccak1600-armv8.pl head/crypto/openssl/crypto/sha/asm/keccak1600-avx2.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/sha/asm/keccak1600-avx2.pl head/crypto/openssl/crypto/sha/asm/keccak1600-avx512.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/sha/asm/keccak1600-avx512.pl head/crypto/openssl/crypto/sha/asm/keccak1600-avx512vl.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/sha/asm/keccak1600-avx512vl.pl head/crypto/openssl/crypto/sha/asm/keccak1600-c64x.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/sha/asm/keccak1600-c64x.pl head/crypto/openssl/crypto/sha/asm/keccak1600-mmx.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/sha/asm/keccak1600-mmx.pl head/crypto/openssl/crypto/sha/asm/keccak1600-ppc64.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/sha/asm/keccak1600-ppc64.pl head/crypto/openssl/crypto/sha/asm/keccak1600-s390x.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/sha/asm/keccak1600-s390x.pl head/crypto/openssl/crypto/sha/asm/keccak1600-x86_64.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/sha/asm/keccak1600-x86_64.pl head/crypto/openssl/crypto/sha/asm/keccak1600p8-ppc.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/sha/asm/keccak1600p8-ppc.pl head/crypto/openssl/crypto/sha/asm/sha1-c64xplus.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/sha/asm/sha1-c64xplus.pl head/crypto/openssl/crypto/sha/asm/sha256-c64xplus.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/sha/asm/sha256-c64xplus.pl head/crypto/openssl/crypto/sha/asm/sha512-c64xplus.pl - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/sha/asm/sha512-c64xplus.pl head/crypto/openssl/crypto/sha/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/sha/build.info head/crypto/openssl/crypto/sha/keccak1600.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/sha/keccak1600.c head/crypto/openssl/crypto/siphash/ - copied from r339267, projects/openssl111/crypto/openssl/crypto/siphash/ head/crypto/openssl/crypto/sm2/ - copied from r339267, projects/openssl111/crypto/openssl/crypto/sm2/ head/crypto/openssl/crypto/sm3/ - copied from r339267, projects/openssl111/crypto/openssl/crypto/sm3/ head/crypto/openssl/crypto/sm4/ - copied from r339267, projects/openssl111/crypto/openssl/crypto/sm4/ head/crypto/openssl/crypto/srp/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/srp/build.info head/crypto/openssl/crypto/stack/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/stack/build.info head/crypto/openssl/crypto/store/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/store/build.info head/crypto/openssl/crypto/store/loader_file.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/store/loader_file.c head/crypto/openssl/crypto/store/store_err.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/store/store_err.c head/crypto/openssl/crypto/store/store_init.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/store/store_init.c head/crypto/openssl/crypto/store/store_lib.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/store/store_lib.c head/crypto/openssl/crypto/store/store_locl.h - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/store/store_locl.h head/crypto/openssl/crypto/store/store_register.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/store/store_register.c head/crypto/openssl/crypto/store/store_strings.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/store/store_strings.c head/crypto/openssl/crypto/threads_none.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/threads_none.c head/crypto/openssl/crypto/threads_pthread.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/threads_pthread.c head/crypto/openssl/crypto/ts/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/ts/build.info head/crypto/openssl/crypto/ts/ts_lcl.h - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/ts/ts_lcl.h head/crypto/openssl/crypto/txt_db/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/txt_db/build.info head/crypto/openssl/crypto/ui/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/ui/build.info head/crypto/openssl/crypto/ui/ui_null.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/ui/ui_null.c head/crypto/openssl/crypto/whrlpool/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/whrlpool/build.info head/crypto/openssl/crypto/x509/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/x509/build.info head/crypto/openssl/crypto/x509/t_crl.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/x509/t_crl.c head/crypto/openssl/crypto/x509/t_req.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/x509/t_req.c head/crypto/openssl/crypto/x509/t_x509.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/x509/t_x509.c head/crypto/openssl/crypto/x509/x509_lcl.h - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/x509/x509_lcl.h head/crypto/openssl/crypto/x509/x509_meth.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/x509/x509_meth.c head/crypto/openssl/crypto/x509/x_attrib.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/x509/x_attrib.c head/crypto/openssl/crypto/x509/x_crl.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/x509/x_crl.c head/crypto/openssl/crypto/x509/x_exten.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/x509/x_exten.c head/crypto/openssl/crypto/x509/x_name.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/x509/x_name.c head/crypto/openssl/crypto/x509/x_pubkey.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/x509/x_pubkey.c head/crypto/openssl/crypto/x509/x_req.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/x509/x_req.c head/crypto/openssl/crypto/x509/x_x509.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/x509/x_x509.c head/crypto/openssl/crypto/x509/x_x509a.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/x509/x_x509a.c head/crypto/openssl/crypto/x509v3/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/x509v3/build.info head/crypto/openssl/crypto/x509v3/standard_exts.h - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/x509v3/standard_exts.h head/crypto/openssl/crypto/x509v3/v3_admis.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/x509v3/v3_admis.c head/crypto/openssl/crypto/x509v3/v3_admis.h - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/x509v3/v3_admis.h head/crypto/openssl/crypto/x509v3/v3_tlsf.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/crypto/x509v3/v3_tlsf.c head/crypto/openssl/doc/man1/ - copied from r339267, projects/openssl111/crypto/openssl/doc/man1/ head/crypto/openssl/doc/man5/ - copied from r339267, projects/openssl111/crypto/openssl/doc/man5/ head/crypto/openssl/doc/man7/ - copied from r339267, projects/openssl111/crypto/openssl/doc/man7/ head/crypto/openssl/engines/asm/ - copied from r339267, projects/openssl111/crypto/openssl/engines/asm/ head/crypto/openssl/engines/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/engines/build.info head/crypto/openssl/engines/e_afalg.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/engines/e_afalg.c head/crypto/openssl/engines/e_afalg.h - copied unchanged from r339267, projects/openssl111/crypto/openssl/engines/e_afalg.h head/crypto/openssl/engines/e_afalg.txt - copied unchanged from r339267, projects/openssl111/crypto/openssl/engines/e_afalg.txt head/crypto/openssl/engines/e_afalg_err.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/engines/e_afalg_err.c head/crypto/openssl/engines/e_afalg_err.h - copied unchanged from r339267, projects/openssl111/crypto/openssl/engines/e_afalg_err.h head/crypto/openssl/engines/e_capi.txt - copied unchanged from r339267, projects/openssl111/crypto/openssl/engines/e_capi.txt head/crypto/openssl/engines/e_dasync.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/engines/e_dasync.c head/crypto/openssl/engines/e_dasync.txt - copied unchanged from r339267, projects/openssl111/crypto/openssl/engines/e_dasync.txt head/crypto/openssl/engines/e_dasync_err.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/engines/e_dasync_err.c head/crypto/openssl/engines/e_dasync_err.h - copied unchanged from r339267, projects/openssl111/crypto/openssl/engines/e_dasync_err.h head/crypto/openssl/engines/e_ossltest.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/engines/e_ossltest.c head/crypto/openssl/engines/e_ossltest.txt - copied unchanged from r339267, projects/openssl111/crypto/openssl/engines/e_ossltest.txt head/crypto/openssl/engines/e_ossltest_err.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/engines/e_ossltest_err.c head/crypto/openssl/engines/e_ossltest_err.h - copied unchanged from r339267, projects/openssl111/crypto/openssl/engines/e_ossltest_err.h head/crypto/openssl/include/ - copied from r339267, projects/openssl111/crypto/openssl/include/ head/crypto/openssl/ssl/build.info - copied unchanged from r339267, projects/openssl111/crypto/openssl/ssl/build.info head/crypto/openssl/ssl/d1_msg.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/ssl/d1_msg.c head/crypto/openssl/ssl/methods.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/ssl/methods.c head/crypto/openssl/ssl/packet.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/ssl/packet.c head/crypto/openssl/ssl/packet_locl.h - copied unchanged from r339267, projects/openssl111/crypto/openssl/ssl/packet_locl.h head/crypto/openssl/ssl/pqueue.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/ssl/pqueue.c head/crypto/openssl/ssl/record/ - copied from r339267, projects/openssl111/crypto/openssl/ssl/record/ head/crypto/openssl/ssl/s3_msg.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/ssl/s3_msg.c head/crypto/openssl/ssl/ssl_cert_table.h - copied unchanged from r339267, projects/openssl111/crypto/openssl/ssl/ssl_cert_table.h head/crypto/openssl/ssl/ssl_init.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/ssl/ssl_init.c head/crypto/openssl/ssl/ssl_mcnf.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/ssl/ssl_mcnf.c head/crypto/openssl/ssl/statem/ - copied from r339267, projects/openssl111/crypto/openssl/ssl/statem/ head/crypto/openssl/ssl/tls13_enc.c - copied unchanged from r339267, projects/openssl111/crypto/openssl/ssl/tls13_enc.c head/secure/lib/libcrypto/Version.map - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/Version.map head/secure/lib/libcrypto/aarch64/arm64cpuid.S - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/aarch64/arm64cpuid.S head/secure/lib/libcrypto/aarch64/armv8-mont.S - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/aarch64/armv8-mont.S head/secure/lib/libcrypto/aarch64/chacha-armv8.S - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/aarch64/chacha-armv8.S head/secure/lib/libcrypto/aarch64/ecp_nistz256-armv8.S - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/aarch64/ecp_nistz256-armv8.S head/secure/lib/libcrypto/aarch64/keccak1600-armv8.S - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/aarch64/keccak1600-armv8.S head/secure/lib/libcrypto/aarch64/poly1305-armv8.S - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/aarch64/poly1305-armv8.S head/secure/lib/libcrypto/aarch64/vpaes-armv8.S - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/aarch64/vpaes-armv8.S head/secure/lib/libcrypto/amd64/chacha-x86_64.S - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/amd64/chacha-x86_64.S head/secure/lib/libcrypto/amd64/e_padlock-x86_64.S - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/amd64/e_padlock-x86_64.S head/secure/lib/libcrypto/amd64/keccak1600-x86_64.S - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/amd64/keccak1600-x86_64.S head/secure/lib/libcrypto/amd64/poly1305-x86_64.S - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/amd64/poly1305-x86_64.S head/secure/lib/libcrypto/amd64/x25519-x86_64.S - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/amd64/x25519-x86_64.S head/secure/lib/libcrypto/arm/armv4cpuid.S - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/arm/armv4cpuid.S head/secure/lib/libcrypto/arm/chacha-armv4.S - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/arm/chacha-armv4.S head/secure/lib/libcrypto/arm/ecp_nistz256-armv4.S - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/arm/ecp_nistz256-armv4.S head/secure/lib/libcrypto/arm/keccak1600-armv4.S - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/arm/keccak1600-armv4.S head/secure/lib/libcrypto/arm/poly1305-armv4.S - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/arm/poly1305-armv4.S head/secure/lib/libcrypto/engines/capi/ - copied from r339267, projects/openssl111/secure/lib/libcrypto/engines/capi/ head/secure/lib/libcrypto/engines/padlock/ - copied from r339267, projects/openssl111/secure/lib/libcrypto/engines/padlock/ head/secure/lib/libcrypto/i386/cast-586.S - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/i386/cast-586.S head/secure/lib/libcrypto/i386/chacha-x86.S - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/i386/chacha-x86.S head/secure/lib/libcrypto/i386/e_padlock-x86.S - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/i386/e_padlock-x86.S head/secure/lib/libcrypto/i386/ecp_nistz256-x86.S - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/i386/ecp_nistz256-x86.S head/secure/lib/libcrypto/i386/poly1305-x86.S - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/i386/poly1305-x86.S head/secure/lib/libcrypto/man/ADMISSIONS.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/ADMISSIONS.3 head/secure/lib/libcrypto/man/ASN1_INTEGER_get_int64.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/ASN1_INTEGER_get_int64.3 head/secure/lib/libcrypto/man/ASN1_ITEM_lookup.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/ASN1_ITEM_lookup.3 head/secure/lib/libcrypto/man/ASN1_STRING_TABLE_add.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/ASN1_STRING_TABLE_add.3 head/secure/lib/libcrypto/man/ASN1_TYPE_get.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/ASN1_TYPE_get.3 head/secure/lib/libcrypto/man/ASYNC_WAIT_CTX_new.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/ASYNC_WAIT_CTX_new.3 head/secure/lib/libcrypto/man/ASYNC_start_job.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/ASYNC_start_job.3 head/secure/lib/libcrypto/man/BF_encrypt.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/BF_encrypt.3 head/secure/lib/libcrypto/man/BIO_ADDR.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/BIO_ADDR.3 head/secure/lib/libcrypto/man/BIO_ADDRINFO.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/BIO_ADDRINFO.3 head/secure/lib/libcrypto/man/BIO_connect.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/BIO_connect.3 head/secure/lib/libcrypto/man/BIO_get_data.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/BIO_get_data.3 head/secure/lib/libcrypto/man/BIO_get_ex_new_index.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/BIO_get_ex_new_index.3 head/secure/lib/libcrypto/man/BIO_meth_new.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/BIO_meth_new.3 head/secure/lib/libcrypto/man/BIO_parse_hostserv.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/BIO_parse_hostserv.3 head/secure/lib/libcrypto/man/BIO_printf.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/BIO_printf.3 head/secure/lib/libcrypto/man/BN_security_bits.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/BN_security_bits.3 head/secure/lib/libcrypto/man/BUF_MEM_new.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/BUF_MEM_new.3 head/secure/lib/libcrypto/man/CRYPTO_THREAD_run_once.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/CRYPTO_THREAD_run_once.3 head/secure/lib/libcrypto/man/CRYPTO_get_ex_new_index.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/CRYPTO_get_ex_new_index.3 head/secure/lib/libcrypto/man/CTLOG_STORE_get0_log_by_id.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/CTLOG_STORE_get0_log_by_id.3 head/secure/lib/libcrypto/man/CTLOG_STORE_new.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/CTLOG_STORE_new.3 head/secure/lib/libcrypto/man/CTLOG_new.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/CTLOG_new.3 head/secure/lib/libcrypto/man/CT_POLICY_EVAL_CTX_new.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/CT_POLICY_EVAL_CTX_new.3 head/secure/lib/libcrypto/man/DEFINE_STACK_OF.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/DEFINE_STACK_OF.3 head/secure/lib/libcrypto/man/DES_random_key.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/DES_random_key.3 head/secure/lib/libcrypto/man/DH_get0_pqg.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/DH_get0_pqg.3 head/secure/lib/libcrypto/man/DH_get_1024_160.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/DH_get_1024_160.3 head/secure/lib/libcrypto/man/DH_meth_new.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/DH_meth_new.3 head/secure/lib/libcrypto/man/DH_new_by_nid.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/DH_new_by_nid.3 head/secure/lib/libcrypto/man/DSA_get0_pqg.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/DSA_get0_pqg.3 head/secure/lib/libcrypto/man/DSA_meth_new.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/DSA_meth_new.3 head/secure/lib/libcrypto/man/DTLS_get_data_mtu.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/DTLS_get_data_mtu.3 head/secure/lib/libcrypto/man/DTLS_set_timer_cb.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/DTLS_set_timer_cb.3 head/secure/lib/libcrypto/man/DTLSv1_listen.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/DTLSv1_listen.3 head/secure/lib/libcrypto/man/ECDSA_SIG_new.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/ECDSA_SIG_new.3 head/secure/lib/libcrypto/man/ECPKParameters_print.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/ECPKParameters_print.3 head/secure/lib/libcrypto/man/EC_KEY_get_enc_flags.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EC_KEY_get_enc_flags.3 head/secure/lib/libcrypto/man/ENGINE_add.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/ENGINE_add.3 head/secure/lib/libcrypto/man/EVP_CIPHER_CTX_get_cipher_data.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_CIPHER_CTX_get_cipher_data.3 head/secure/lib/libcrypto/man/EVP_CIPHER_meth_new.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_CIPHER_meth_new.3 head/secure/lib/libcrypto/man/EVP_MD_meth_new.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_MD_meth_new.3 head/secure/lib/libcrypto/man/EVP_PKEY_ASN1_METHOD.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_PKEY_ASN1_METHOD.3 head/secure/lib/libcrypto/man/EVP_PKEY_CTX_set1_pbe_pass.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_PKEY_CTX_set1_pbe_pass.3 head/secure/lib/libcrypto/man/EVP_PKEY_CTX_set_hkdf_md.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_PKEY_CTX_set_hkdf_md.3 head/secure/lib/libcrypto/man/EVP_PKEY_CTX_set_rsa_pss_keygen_md.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_PKEY_CTX_set_rsa_pss_keygen_md.3 head/secure/lib/libcrypto/man/EVP_PKEY_CTX_set_scrypt_N.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_PKEY_CTX_set_scrypt_N.3 head/secure/lib/libcrypto/man/EVP_PKEY_CTX_set_tls1_prf_md.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_PKEY_CTX_set_tls1_prf_md.3 head/secure/lib/libcrypto/man/EVP_PKEY_asn1_get_count.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_PKEY_asn1_get_count.3 head/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest_nid.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest_nid.3 head/secure/lib/libcrypto/man/EVP_PKEY_meth_get_count.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_PKEY_meth_get_count.3 head/secure/lib/libcrypto/man/EVP_aes.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_aes.3 head/secure/lib/libcrypto/man/EVP_aria.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_aria.3 head/secure/lib/libcrypto/man/EVP_bf_cbc.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_bf_cbc.3 head/secure/lib/libcrypto/man/EVP_blake2b512.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_blake2b512.3 head/secure/lib/libcrypto/man/EVP_camellia.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_camellia.3 head/secure/lib/libcrypto/man/EVP_cast5_cbc.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_cast5_cbc.3 head/secure/lib/libcrypto/man/EVP_chacha20.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_chacha20.3 head/secure/lib/libcrypto/man/EVP_des.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_des.3 head/secure/lib/libcrypto/man/EVP_desx_cbc.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_desx_cbc.3 head/secure/lib/libcrypto/man/EVP_idea_cbc.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_idea_cbc.3 head/secure/lib/libcrypto/man/EVP_md2.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_md2.3 head/secure/lib/libcrypto/man/EVP_md4.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_md4.3 head/secure/lib/libcrypto/man/EVP_md5.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_md5.3 head/secure/lib/libcrypto/man/EVP_mdc2.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_mdc2.3 head/secure/lib/libcrypto/man/EVP_rc2_cbc.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_rc2_cbc.3 head/secure/lib/libcrypto/man/EVP_rc4.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_rc4.3 head/secure/lib/libcrypto/man/EVP_rc5_32_12_16_cbc.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_rc5_32_12_16_cbc.3 head/secure/lib/libcrypto/man/EVP_ripemd160.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_ripemd160.3 head/secure/lib/libcrypto/man/EVP_seed_cbc.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_seed_cbc.3 head/secure/lib/libcrypto/man/EVP_sha1.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_sha1.3 head/secure/lib/libcrypto/man/EVP_sha224.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_sha224.3 head/secure/lib/libcrypto/man/EVP_sha3_224.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_sha3_224.3 head/secure/lib/libcrypto/man/EVP_sm3.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_sm3.3 head/secure/lib/libcrypto/man/EVP_sm4_cbc.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_sm4_cbc.3 head/secure/lib/libcrypto/man/EVP_whirlpool.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/EVP_whirlpool.3 head/secure/lib/libcrypto/man/HMAC.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/HMAC.3 head/secure/lib/libcrypto/man/MD5.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/MD5.3 head/secure/lib/libcrypto/man/MDC2_Init.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/MDC2_Init.3 head/secure/lib/libcrypto/man/OCSP_REQUEST_new.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/OCSP_REQUEST_new.3 head/secure/lib/libcrypto/man/OCSP_cert_to_id.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/OCSP_cert_to_id.3 head/secure/lib/libcrypto/man/OCSP_request_add1_nonce.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/OCSP_request_add1_nonce.3 head/secure/lib/libcrypto/man/OCSP_resp_find_status.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/OCSP_resp_find_status.3 head/secure/lib/libcrypto/man/OCSP_response_status.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/OCSP_response_status.3 head/secure/lib/libcrypto/man/OCSP_sendreq_new.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/OCSP_sendreq_new.3 head/secure/lib/libcrypto/man/OPENSSL_LH_COMPFUNC.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/OPENSSL_LH_COMPFUNC.3 head/secure/lib/libcrypto/man/OPENSSL_LH_stats.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/OPENSSL_LH_stats.3 head/secure/lib/libcrypto/man/OPENSSL_fork_prepare.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/OPENSSL_fork_prepare.3 head/secure/lib/libcrypto/man/OPENSSL_init_crypto.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/OPENSSL_init_crypto.3 head/secure/lib/libcrypto/man/OPENSSL_init_ssl.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/OPENSSL_init_ssl.3 head/secure/lib/libcrypto/man/OPENSSL_malloc.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/OPENSSL_malloc.3 head/secure/lib/libcrypto/man/OPENSSL_secure_malloc.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/OPENSSL_secure_malloc.3 head/secure/lib/libcrypto/man/OSSL_STORE_INFO.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/OSSL_STORE_INFO.3 head/secure/lib/libcrypto/man/OSSL_STORE_LOADER.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/OSSL_STORE_LOADER.3 head/secure/lib/libcrypto/man/OSSL_STORE_SEARCH.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/OSSL_STORE_SEARCH.3 head/secure/lib/libcrypto/man/OSSL_STORE_expect.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/OSSL_STORE_expect.3 head/secure/lib/libcrypto/man/OSSL_STORE_open.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/OSSL_STORE_open.3 head/secure/lib/libcrypto/man/PEM_bytes_read_bio.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/PEM_bytes_read_bio.3 head/secure/lib/libcrypto/man/PEM_read.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/PEM_read.3 head/secure/lib/libcrypto/man/PEM_read_CMS.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/PEM_read_CMS.3 head/secure/lib/libcrypto/man/PEM_read_bio_PrivateKey.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/PEM_read_bio_PrivateKey.3 head/secure/lib/libcrypto/man/PEM_read_bio_ex.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/PEM_read_bio_ex.3 head/secure/lib/libcrypto/man/PKCS12_newpass.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/PKCS12_newpass.3 head/secure/lib/libcrypto/man/PKCS5_PBKDF2_HMAC.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/PKCS5_PBKDF2_HMAC.3 head/secure/lib/libcrypto/man/RAND_DRBG_generate.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/RAND_DRBG_generate.3 head/secure/lib/libcrypto/man/RAND_DRBG_get0_master.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/RAND_DRBG_get0_master.3 head/secure/lib/libcrypto/man/RAND_DRBG_new.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/RAND_DRBG_new.3 head/secure/lib/libcrypto/man/RAND_DRBG_reseed.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/RAND_DRBG_reseed.3 head/secure/lib/libcrypto/man/RAND_DRBG_set_callbacks.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/RAND_DRBG_set_callbacks.3 head/secure/lib/libcrypto/man/RAND_DRBG_set_ex_data.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/RAND_DRBG_set_ex_data.3 head/secure/lib/libcrypto/man/RC4_set_key.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/RC4_set_key.3 head/secure/lib/libcrypto/man/RIPEMD160_Init.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/RIPEMD160_Init.3 head/secure/lib/libcrypto/man/RSA_get0_key.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/RSA_get0_key.3 head/secure/lib/libcrypto/man/RSA_meth_new.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/RSA_meth_new.3 head/secure/lib/libcrypto/man/SCT_new.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SCT_new.3 head/secure/lib/libcrypto/man/SCT_print.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SCT_print.3 head/secure/lib/libcrypto/man/SCT_validate.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SCT_validate.3 head/secure/lib/libcrypto/man/SHA256_Init.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SHA256_Init.3 head/secure/lib/libcrypto/man/SSL_CIPHER_get_name.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CIPHER_get_name.3 head/secure/lib/libcrypto/man/SSL_COMP_add_compression_method.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_COMP_add_compression_method.3 head/secure/lib/libcrypto/man/SSL_CONF_CTX_new.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CONF_CTX_new.3 head/secure/lib/libcrypto/man/SSL_CONF_CTX_set1_prefix.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CONF_CTX_set1_prefix.3 head/secure/lib/libcrypto/man/SSL_CONF_CTX_set_flags.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CONF_CTX_set_flags.3 head/secure/lib/libcrypto/man/SSL_CONF_CTX_set_ssl_ctx.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CONF_CTX_set_ssl_ctx.3 head/secure/lib/libcrypto/man/SSL_CONF_cmd.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CONF_cmd.3 head/secure/lib/libcrypto/man/SSL_CONF_cmd_argv.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CONF_cmd_argv.3 head/secure/lib/libcrypto/man/SSL_CTX_add1_chain_cert.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_add1_chain_cert.3 head/secure/lib/libcrypto/man/SSL_CTX_add_extra_chain_cert.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_add_extra_chain_cert.3 head/secure/lib/libcrypto/man/SSL_CTX_add_session.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_add_session.3 head/secure/lib/libcrypto/man/SSL_CTX_config.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_config.3 head/secure/lib/libcrypto/man/SSL_CTX_ctrl.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_ctrl.3 head/secure/lib/libcrypto/man/SSL_CTX_dane_enable.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_dane_enable.3 head/secure/lib/libcrypto/man/SSL_CTX_flush_sessions.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_flush_sessions.3 head/secure/lib/libcrypto/man/SSL_CTX_free.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_free.3 head/secure/lib/libcrypto/man/SSL_CTX_get0_param.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_get0_param.3 head/secure/lib/libcrypto/man/SSL_CTX_get_verify_mode.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_get_verify_mode.3 head/secure/lib/libcrypto/man/SSL_CTX_has_client_custom_ext.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_has_client_custom_ext.3 head/secure/lib/libcrypto/man/SSL_CTX_load_verify_locations.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_load_verify_locations.3 head/secure/lib/libcrypto/man/SSL_CTX_new.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_new.3 head/secure/lib/libcrypto/man/SSL_CTX_sess_number.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_sess_number.3 head/secure/lib/libcrypto/man/SSL_CTX_sess_set_cache_size.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_sess_set_cache_size.3 head/secure/lib/libcrypto/man/SSL_CTX_sess_set_get_cb.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_sess_set_get_cb.3 head/secure/lib/libcrypto/man/SSL_CTX_sessions.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_sessions.3 head/secure/lib/libcrypto/man/SSL_CTX_set0_CA_list.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set0_CA_list.3 head/secure/lib/libcrypto/man/SSL_CTX_set1_curves.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set1_curves.3 head/secure/lib/libcrypto/man/SSL_CTX_set1_sigalgs.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set1_sigalgs.3 head/secure/lib/libcrypto/man/SSL_CTX_set1_verify_cert_store.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set1_verify_cert_store.3 head/secure/lib/libcrypto/man/SSL_CTX_set_alpn_select_cb.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_alpn_select_cb.3 head/secure/lib/libcrypto/man/SSL_CTX_set_cert_cb.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_cert_cb.3 head/secure/lib/libcrypto/man/SSL_CTX_set_cert_store.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_cert_store.3 head/secure/lib/libcrypto/man/SSL_CTX_set_cert_verify_callback.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_cert_verify_callback.3 head/secure/lib/libcrypto/man/SSL_CTX_set_cipher_list.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_cipher_list.3 head/secure/lib/libcrypto/man/SSL_CTX_set_client_CA_list.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_client_CA_list.3 head/secure/lib/libcrypto/man/SSL_CTX_set_client_cert_cb.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_client_cert_cb.3 head/secure/lib/libcrypto/man/SSL_CTX_set_client_hello_cb.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_client_hello_cb.3 head/secure/lib/libcrypto/man/SSL_CTX_set_ct_validation_callback.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_ct_validation_callback.3 head/secure/lib/libcrypto/man/SSL_CTX_set_ctlog_list_file.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_ctlog_list_file.3 head/secure/lib/libcrypto/man/SSL_CTX_set_default_passwd_cb.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_default_passwd_cb.3 head/secure/lib/libcrypto/man/SSL_CTX_set_ex_data.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_ex_data.3 head/secure/lib/libcrypto/man/SSL_CTX_set_generate_session_id.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_generate_session_id.3 head/secure/lib/libcrypto/man/SSL_CTX_set_info_callback.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_info_callback.3 head/secure/lib/libcrypto/man/SSL_CTX_set_keylog_callback.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_keylog_callback.3 head/secure/lib/libcrypto/man/SSL_CTX_set_max_cert_list.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_max_cert_list.3 head/secure/lib/libcrypto/man/SSL_CTX_set_min_proto_version.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_min_proto_version.3 head/secure/lib/libcrypto/man/SSL_CTX_set_mode.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_mode.3 head/secure/lib/libcrypto/man/SSL_CTX_set_msg_callback.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_msg_callback.3 head/secure/lib/libcrypto/man/SSL_CTX_set_num_tickets.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_num_tickets.3 head/secure/lib/libcrypto/man/SSL_CTX_set_options.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_options.3 head/secure/lib/libcrypto/man/SSL_CTX_set_psk_client_callback.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_psk_client_callback.3 head/secure/lib/libcrypto/man/SSL_CTX_set_quiet_shutdown.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_quiet_shutdown.3 head/secure/lib/libcrypto/man/SSL_CTX_set_read_ahead.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_read_ahead.3 head/secure/lib/libcrypto/man/SSL_CTX_set_record_padding_callback.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_record_padding_callback.3 head/secure/lib/libcrypto/man/SSL_CTX_set_security_level.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_security_level.3 head/secure/lib/libcrypto/man/SSL_CTX_set_session_cache_mode.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_session_cache_mode.3 head/secure/lib/libcrypto/man/SSL_CTX_set_session_id_context.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_session_id_context.3 head/secure/lib/libcrypto/man/SSL_CTX_set_session_ticket_cb.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_session_ticket_cb.3 head/secure/lib/libcrypto/man/SSL_CTX_set_split_send_fragment.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_split_send_fragment.3 head/secure/lib/libcrypto/man/SSL_CTX_set_ssl_version.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_ssl_version.3 head/secure/lib/libcrypto/man/SSL_CTX_set_stateless_cookie_generate_cb.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_stateless_cookie_generate_cb.3 head/secure/lib/libcrypto/man/SSL_CTX_set_timeout.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_timeout.3 head/secure/lib/libcrypto/man/SSL_CTX_set_tlsext_servername_callback.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_tlsext_servername_callback.3 head/secure/lib/libcrypto/man/SSL_CTX_set_tlsext_status_cb.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_tlsext_status_cb.3 head/secure/lib/libcrypto/man/SSL_CTX_set_tlsext_ticket_key_cb.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_tlsext_ticket_key_cb.3 head/secure/lib/libcrypto/man/SSL_CTX_set_tlsext_use_srtp.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_tlsext_use_srtp.3 head/secure/lib/libcrypto/man/SSL_CTX_set_tmp_dh_callback.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_tmp_dh_callback.3 head/secure/lib/libcrypto/man/SSL_CTX_set_verify.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_set_verify.3 head/secure/lib/libcrypto/man/SSL_CTX_use_certificate.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_use_certificate.3 head/secure/lib/libcrypto/man/SSL_CTX_use_psk_identity_hint.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_use_psk_identity_hint.3 head/secure/lib/libcrypto/man/SSL_CTX_use_serverinfo.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_CTX_use_serverinfo.3 head/secure/lib/libcrypto/man/SSL_SESSION_free.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_SESSION_free.3 head/secure/lib/libcrypto/man/SSL_SESSION_get0_cipher.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_SESSION_get0_cipher.3 head/secure/lib/libcrypto/man/SSL_SESSION_get0_hostname.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_SESSION_get0_hostname.3 head/secure/lib/libcrypto/man/SSL_SESSION_get0_id_context.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_SESSION_get0_id_context.3 head/secure/lib/libcrypto/man/SSL_SESSION_get0_peer.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_SESSION_get0_peer.3 head/secure/lib/libcrypto/man/SSL_SESSION_get_compress_id.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_SESSION_get_compress_id.3 head/secure/lib/libcrypto/man/SSL_SESSION_get_ex_data.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_SESSION_get_ex_data.3 head/secure/lib/libcrypto/man/SSL_SESSION_get_protocol_version.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_SESSION_get_protocol_version.3 head/secure/lib/libcrypto/man/SSL_SESSION_get_time.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_SESSION_get_time.3 head/secure/lib/libcrypto/man/SSL_SESSION_has_ticket.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_SESSION_has_ticket.3 head/secure/lib/libcrypto/man/SSL_SESSION_is_resumable.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_SESSION_is_resumable.3 head/secure/lib/libcrypto/man/SSL_SESSION_print.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_SESSION_print.3 head/secure/lib/libcrypto/man/SSL_SESSION_set1_id.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_SESSION_set1_id.3 head/secure/lib/libcrypto/man/SSL_accept.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_accept.3 head/secure/lib/libcrypto/man/SSL_alert_type_string.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_alert_type_string.3 head/secure/lib/libcrypto/man/SSL_alloc_buffers.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_alloc_buffers.3 head/secure/lib/libcrypto/man/SSL_check_chain.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_check_chain.3 head/secure/lib/libcrypto/man/SSL_clear.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_clear.3 head/secure/lib/libcrypto/man/SSL_connect.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_connect.3 head/secure/lib/libcrypto/man/SSL_do_handshake.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_do_handshake.3 head/secure/lib/libcrypto/man/SSL_export_keying_material.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_export_keying_material.3 head/secure/lib/libcrypto/man/SSL_extension_supported.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_extension_supported.3 head/secure/lib/libcrypto/man/SSL_free.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_free.3 head/secure/lib/libcrypto/man/SSL_get0_peer_scts.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_get0_peer_scts.3 head/secure/lib/libcrypto/man/SSL_get_SSL_CTX.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_get_SSL_CTX.3 head/secure/lib/libcrypto/man/SSL_get_all_async_fds.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_get_all_async_fds.3 head/secure/lib/libcrypto/man/SSL_get_ciphers.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_get_ciphers.3 head/secure/lib/libcrypto/man/SSL_get_client_CA_list.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_get_client_CA_list.3 head/secure/lib/libcrypto/man/SSL_get_client_random.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_get_client_random.3 head/secure/lib/libcrypto/man/SSL_get_current_cipher.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_get_current_cipher.3 head/secure/lib/libcrypto/man/SSL_get_default_timeout.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_get_default_timeout.3 head/secure/lib/libcrypto/man/SSL_get_error.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_get_error.3 head/secure/lib/libcrypto/man/SSL_get_extms_support.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_get_extms_support.3 head/secure/lib/libcrypto/man/SSL_get_fd.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_get_fd.3 head/secure/lib/libcrypto/man/SSL_get_peer_cert_chain.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_get_peer_cert_chain.3 head/secure/lib/libcrypto/man/SSL_get_peer_certificate.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_get_peer_certificate.3 head/secure/lib/libcrypto/man/SSL_get_peer_signature_nid.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_get_peer_signature_nid.3 head/secure/lib/libcrypto/man/SSL_get_psk_identity.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_get_psk_identity.3 head/secure/lib/libcrypto/man/SSL_get_rbio.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_get_rbio.3 head/secure/lib/libcrypto/man/SSL_get_server_tmp_key.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_get_server_tmp_key.3 head/secure/lib/libcrypto/man/SSL_get_session.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_get_session.3 head/secure/lib/libcrypto/man/SSL_get_shared_sigalgs.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_get_shared_sigalgs.3 head/secure/lib/libcrypto/man/SSL_get_verify_result.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_get_verify_result.3 head/secure/lib/libcrypto/man/SSL_get_version.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_get_version.3 head/secure/lib/libcrypto/man/SSL_in_init.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_in_init.3 head/secure/lib/libcrypto/man/SSL_key_update.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_key_update.3 head/secure/lib/libcrypto/man/SSL_library_init.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_library_init.3 head/secure/lib/libcrypto/man/SSL_load_client_CA_file.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_load_client_CA_file.3 head/secure/lib/libcrypto/man/SSL_new.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_new.3 head/secure/lib/libcrypto/man/SSL_pending.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_pending.3 head/secure/lib/libcrypto/man/SSL_read.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_read.3 head/secure/lib/libcrypto/man/SSL_read_early_data.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_read_early_data.3 head/secure/lib/libcrypto/man/SSL_rstate_string.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_rstate_string.3 head/secure/lib/libcrypto/man/SSL_session_reused.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_session_reused.3 head/secure/lib/libcrypto/man/SSL_set1_host.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_set1_host.3 head/secure/lib/libcrypto/man/SSL_set_bio.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_set_bio.3 head/secure/lib/libcrypto/man/SSL_set_connect_state.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_set_connect_state.3 head/secure/lib/libcrypto/man/SSL_set_fd.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_set_fd.3 head/secure/lib/libcrypto/man/SSL_set_session.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_set_session.3 head/secure/lib/libcrypto/man/SSL_set_shutdown.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_set_shutdown.3 head/secure/lib/libcrypto/man/SSL_set_verify_result.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_set_verify_result.3 head/secure/lib/libcrypto/man/SSL_shutdown.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_shutdown.3 head/secure/lib/libcrypto/man/SSL_state_string.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_state_string.3 head/secure/lib/libcrypto/man/SSL_want.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_want.3 head/secure/lib/libcrypto/man/SSL_write.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/SSL_write.3 head/secure/lib/libcrypto/man/UI_STRING.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/UI_STRING.3 head/secure/lib/libcrypto/man/UI_UTIL_read_pw.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/UI_UTIL_read_pw.3 head/secure/lib/libcrypto/man/UI_create_method.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/UI_create_method.3 head/secure/lib/libcrypto/man/UI_new.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/UI_new.3 head/secure/lib/libcrypto/man/X509V3_get_d2i.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/X509V3_get_d2i.3 head/secure/lib/libcrypto/man/X509_ALGOR_dup.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/X509_ALGOR_dup.3 head/secure/lib/libcrypto/man/X509_CRL_get0_by_serial.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/X509_CRL_get0_by_serial.3 head/secure/lib/libcrypto/man/X509_EXTENSION_set_object.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/X509_EXTENSION_set_object.3 head/secure/lib/libcrypto/man/X509_LOOKUP_hash_dir.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/X509_LOOKUP_hash_dir.3 head/secure/lib/libcrypto/man/X509_LOOKUP_meth_new.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/X509_LOOKUP_meth_new.3 head/secure/lib/libcrypto/man/X509_NAME_get0_der.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/X509_NAME_get0_der.3 head/secure/lib/libcrypto/man/X509_PUBKEY_new.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/X509_PUBKEY_new.3 head/secure/lib/libcrypto/man/X509_SIG_get0.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/X509_SIG_get0.3 head/secure/lib/libcrypto/man/X509_STORE_add_cert.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/X509_STORE_add_cert.3 head/secure/lib/libcrypto/man/X509_STORE_get0_param.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/X509_STORE_get0_param.3 head/secure/lib/libcrypto/man/X509_STORE_new.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/X509_STORE_new.3 head/secure/lib/libcrypto/man/X509_check_ca.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/X509_check_ca.3 head/secure/lib/libcrypto/man/X509_check_issued.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/X509_check_issued.3 head/secure/lib/libcrypto/man/X509_digest.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/X509_digest.3 head/secure/lib/libcrypto/man/X509_dup.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/X509_dup.3 head/secure/lib/libcrypto/man/X509_get0_notBefore.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/X509_get0_notBefore.3 head/secure/lib/libcrypto/man/X509_get0_signature.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/X509_get0_signature.3 head/secure/lib/libcrypto/man/X509_get0_uids.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/X509_get0_uids.3 head/secure/lib/libcrypto/man/X509_get_extension_flags.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/X509_get_extension_flags.3 head/secure/lib/libcrypto/man/X509_get_pubkey.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/X509_get_pubkey.3 head/secure/lib/libcrypto/man/X509_get_serialNumber.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/X509_get_serialNumber.3 head/secure/lib/libcrypto/man/X509_get_subject_name.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/X509_get_subject_name.3 head/secure/lib/libcrypto/man/X509_get_version.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/X509_get_version.3 head/secure/lib/libcrypto/man/X509_sign.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/X509_sign.3 head/secure/lib/libcrypto/man/X509v3_get_ext_by_NID.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/X509v3_get_ext_by_NID.3 head/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3 head/secure/lib/libcrypto/man/d2i_SSL_SESSION.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/d2i_SSL_SESSION.3 head/secure/lib/libcrypto/man/i2d_re_X509_tbs.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/i2d_re_X509_tbs.3 head/secure/lib/libcrypto/man/o2i_SCT_LIST.3 - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/man/o2i_SCT_LIST.3 head/secure/lib/libcrypto/opensslconf.h.in - copied unchanged from r339267, projects/openssl111/secure/lib/libcrypto/opensslconf.h.in head/secure/lib/libssl/Version.map - copied unchanged from r339267, projects/openssl111/secure/lib/libssl/Version.map head/secure/usr.bin/openssl/man/engine.1 - copied unchanged from r339267, projects/openssl111/secure/usr.bin/openssl/man/engine.1 head/secure/usr.bin/openssl/man/list.1 - copied unchanged from r339267, projects/openssl111/secure/usr.bin/openssl/man/list.1 head/secure/usr.bin/openssl/man/prime.1 - copied unchanged from r339267, projects/openssl111/secure/usr.bin/openssl/man/prime.1 head/secure/usr.bin/openssl/man/srp.1 - copied unchanged from r339267, projects/openssl111/secure/usr.bin/openssl/man/srp.1 head/secure/usr.bin/openssl/man/storeutl.1 - copied unchanged from r339267, projects/openssl111/secure/usr.bin/openssl/man/storeutl.1 Replaced: head/crypto/openssh/openbsd-compat/libressl-api-compat.c - copied unchanged from r339267, projects/openssl111/crypto/openssh/openbsd-compat/libressl-api-compat.c head/crypto/openssl/apps/progs.h - copied unchanged from r339267, projects/openssl111/crypto/openssl/apps/progs.h head/crypto/openssl/doc/man3/ - copied from r339267, projects/openssl111/crypto/openssl/doc/man3/ Deleted: head/crypto/openssl/ACKNOWLEDGMENTS head/crypto/openssl/CHANGES.SSLeay head/crypto/openssl/Makefile head/crypto/openssl/Makefile.org head/crypto/openssl/Makefile.shared head/crypto/openssl/PROBLEMS head/crypto/openssl/README.ASN1 head/crypto/openssl/apps/CA.pl head/crypto/openssl/apps/CA.sh head/crypto/openssl/apps/Makefile head/crypto/openssl/apps/dh.c head/crypto/openssl/apps/dh512.pem head/crypto/openssl/apps/gendh.c head/crypto/openssl/apps/oid.cnf head/crypto/openssl/apps/set/ head/crypto/openssl/apps/tsget head/crypto/openssl/certs/ head/crypto/openssl/crypto/Makefile head/crypto/openssl/crypto/aes/Makefile head/crypto/openssl/crypto/aes/README head/crypto/openssl/crypto/aes/aes.h head/crypto/openssl/crypto/aes/aes_ctr.c head/crypto/openssl/crypto/arm64cpuid.S head/crypto/openssl/crypto/armv4cpuid.S head/crypto/openssl/crypto/asn1/Makefile head/crypto/openssl/crypto/asn1/a_bool.c head/crypto/openssl/crypto/asn1/a_bytes.c head/crypto/openssl/crypto/asn1/a_enum.c head/crypto/openssl/crypto/asn1/a_set.c head/crypto/openssl/crypto/asn1/asn1.h head/crypto/openssl/crypto/asn1/asn1_int.h head/crypto/openssl/crypto/asn1/asn1_mac.h head/crypto/openssl/crypto/asn1/asn1t.h head/crypto/openssl/crypto/asn1/f_enum.c head/crypto/openssl/crypto/asn1/t_crl.c head/crypto/openssl/crypto/asn1/t_req.c head/crypto/openssl/crypto/asn1/t_x509.c head/crypto/openssl/crypto/asn1/t_x509a.c head/crypto/openssl/crypto/asn1/x_attrib.c head/crypto/openssl/crypto/asn1/x_crl.c head/crypto/openssl/crypto/asn1/x_exten.c head/crypto/openssl/crypto/asn1/x_name.c head/crypto/openssl/crypto/asn1/x_nx509.c head/crypto/openssl/crypto/asn1/x_pubkey.c head/crypto/openssl/crypto/asn1/x_req.c head/crypto/openssl/crypto/asn1/x_x509.c head/crypto/openssl/crypto/asn1/x_x509a.c head/crypto/openssl/crypto/bf/COPYRIGHT head/crypto/openssl/crypto/bf/INSTALL head/crypto/openssl/crypto/bf/Makefile head/crypto/openssl/crypto/bf/README head/crypto/openssl/crypto/bf/VERSION head/crypto/openssl/crypto/bf/asm/bf-686.pl head/crypto/openssl/crypto/bf/asm/readme head/crypto/openssl/crypto/bf/bf_cbc.c head/crypto/openssl/crypto/bf/bf_opts.c head/crypto/openssl/crypto/bf/bfspeed.c head/crypto/openssl/crypto/bf/bftest.c head/crypto/openssl/crypto/bf/blowfish.h head/crypto/openssl/crypto/bio/Makefile head/crypto/openssl/crypto/bio/bio.h head/crypto/openssl/crypto/bio/bss_rtcp.c head/crypto/openssl/crypto/bn/Makefile head/crypto/openssl/crypto/bn/asm/README head/crypto/openssl/crypto/bn/asm/mips3-mont.pl head/crypto/openssl/crypto/bn/asm/mips3.s head/crypto/openssl/crypto/bn/asm/pa-risc2.s head/crypto/openssl/crypto/bn/asm/pa-risc2W.s head/crypto/openssl/crypto/bn/asm/x86/ head/crypto/openssl/crypto/bn/asm/x86.pl head/crypto/openssl/crypto/bn/bn.h head/crypto/openssl/crypto/bn/bn.mul head/crypto/openssl/crypto/bn/bnspeed.c head/crypto/openssl/crypto/bn/bntest.c head/crypto/openssl/crypto/bn/divtest.c head/crypto/openssl/crypto/bn/exp.c head/crypto/openssl/crypto/bn/expspeed.c head/crypto/openssl/crypto/bn/exptest.c head/crypto/openssl/crypto/bn/todo head/crypto/openssl/crypto/bn_int.h head/crypto/openssl/crypto/buffer/Makefile head/crypto/openssl/crypto/buffer/buf_str.c head/crypto/openssl/crypto/buffer/buffer.h head/crypto/openssl/crypto/camellia/Makefile head/crypto/openssl/crypto/camellia/camellia.h head/crypto/openssl/crypto/camellia/cmll_utl.c head/crypto/openssl/crypto/cast/Makefile head/crypto/openssl/crypto/cast/asm/readme head/crypto/openssl/crypto/cast/cast.h head/crypto/openssl/crypto/cast/cast_spd.c head/crypto/openssl/crypto/cast/castopts.c head/crypto/openssl/crypto/cast/casttest.c head/crypto/openssl/crypto/cmac/Makefile head/crypto/openssl/crypto/cmac/cmac.h head/crypto/openssl/crypto/cms/Makefile head/crypto/openssl/crypto/cms/cms.h head/crypto/openssl/crypto/comp/Makefile head/crypto/openssl/crypto/comp/c_rle.c head/crypto/openssl/crypto/comp/comp.h head/crypto/openssl/crypto/conf/Makefile head/crypto/openssl/crypto/conf/README head/crypto/openssl/crypto/conf/cnf_save.c head/crypto/openssl/crypto/conf/conf.h head/crypto/openssl/crypto/conf/conf_api.h head/crypto/openssl/crypto/conf/ssleay.cnf head/crypto/openssl/crypto/conf/test.c head/crypto/openssl/crypto/constant_time_locl.h head/crypto/openssl/crypto/constant_time_test.c head/crypto/openssl/crypto/cryptlib.h head/crypto/openssl/crypto/crypto.h head/crypto/openssl/crypto/des/COPYRIGHT head/crypto/openssl/crypto/des/DES.pm head/crypto/openssl/crypto/des/DES.xs head/crypto/openssl/crypto/des/FILES0 head/crypto/openssl/crypto/des/INSTALL head/crypto/openssl/crypto/des/Imakefile head/crypto/openssl/crypto/des/KERBEROS head/crypto/openssl/crypto/des/Makefile head/crypto/openssl/crypto/des/README head/crypto/openssl/crypto/des/VERSION head/crypto/openssl/crypto/des/asm/readme head/crypto/openssl/crypto/des/cbc3_enc.c head/crypto/openssl/crypto/des/des.c head/crypto/openssl/crypto/des/des.h head/crypto/openssl/crypto/des/des.pod head/crypto/openssl/crypto/des/des_old.c head/crypto/openssl/crypto/des/des_old.h head/crypto/openssl/crypto/des/des_old2.c head/crypto/openssl/crypto/des/des_opts.c head/crypto/openssl/crypto/des/des_ver.h head/crypto/openssl/crypto/des/destest.c head/crypto/openssl/crypto/des/ede_cbcm_enc.c head/crypto/openssl/crypto/des/enc_read.c head/crypto/openssl/crypto/des/enc_writ.c head/crypto/openssl/crypto/des/makefile.bc head/crypto/openssl/crypto/des/options.txt head/crypto/openssl/crypto/des/read2pwd.c head/crypto/openssl/crypto/des/read_pwd.c head/crypto/openssl/crypto/des/rpc_des.h head/crypto/openssl/crypto/des/rpc_enc.c head/crypto/openssl/crypto/des/rpw.c head/crypto/openssl/crypto/des/speed.c head/crypto/openssl/crypto/des/typemap head/crypto/openssl/crypto/dh/Makefile head/crypto/openssl/crypto/dh/dh.h head/crypto/openssl/crypto/dh/dhtest.c head/crypto/openssl/crypto/dh/example head/crypto/openssl/crypto/dh/generate head/crypto/openssl/crypto/dh/p1024.c head/crypto/openssl/crypto/dh/p192.c head/crypto/openssl/crypto/dh/p512.c head/crypto/openssl/crypto/dsa/Makefile head/crypto/openssl/crypto/dsa/README head/crypto/openssl/crypto/dsa/dsa.h head/crypto/openssl/crypto/dsa/dsagen.c head/crypto/openssl/crypto/dsa/dsatest.c head/crypto/openssl/crypto/dsa/fips186a.txt head/crypto/openssl/crypto/dso/Makefile head/crypto/openssl/crypto/dso/README head/crypto/openssl/crypto/dso/dso.h head/crypto/openssl/crypto/dso/dso_beos.c head/crypto/openssl/crypto/dso/dso_null.c head/crypto/openssl/crypto/ebcdic.h head/crypto/openssl/crypto/ec/Makefile head/crypto/openssl/crypto/ec/ec.h head/crypto/openssl/crypto/ec/ec2_mult.c head/crypto/openssl/crypto/ec/ectest.c head/crypto/openssl/crypto/ecdh/ head/crypto/openssl/crypto/ecdsa/ head/crypto/openssl/crypto/engine/Makefile head/crypto/openssl/crypto/engine/eng_cryptodev.c head/crypto/openssl/crypto/engine/engine.h head/crypto/openssl/crypto/engine/enginetest.c head/crypto/openssl/crypto/engine/tb_ecdh.c head/crypto/openssl/crypto/engine/tb_ecdsa.c head/crypto/openssl/crypto/engine/tb_store.c head/crypto/openssl/crypto/err/Makefile head/crypto/openssl/crypto/err/err.h head/crypto/openssl/crypto/evp/Makefile head/crypto/openssl/crypto/evp/c_all.c head/crypto/openssl/crypto/evp/e_dsa.c head/crypto/openssl/crypto/evp/evp.h head/crypto/openssl/crypto/evp/evp_acnf.c head/crypto/openssl/crypto/evp/evp_extra_test.c head/crypto/openssl/crypto/evp/evp_test.c head/crypto/openssl/crypto/evp/evptests.txt head/crypto/openssl/crypto/evp/m_dss.c head/crypto/openssl/crypto/evp/m_dss1.c head/crypto/openssl/crypto/evp/m_ecdsa.c head/crypto/openssl/crypto/evp/m_sha.c head/crypto/openssl/crypto/evp/openbsd_hw.c head/crypto/openssl/crypto/fips_err.h head/crypto/openssl/crypto/fips_ers.c head/crypto/openssl/crypto/hmac/Makefile head/crypto/openssl/crypto/hmac/hmac.h head/crypto/openssl/crypto/hmac/hmactest.c head/crypto/openssl/crypto/idea/Makefile head/crypto/openssl/crypto/idea/idea.h head/crypto/openssl/crypto/idea/idea_spd.c head/crypto/openssl/crypto/idea/ideatest.c head/crypto/openssl/crypto/idea/version head/crypto/openssl/crypto/jpake/ head/crypto/openssl/crypto/krb5/ head/crypto/openssl/crypto/lhash/Makefile head/crypto/openssl/crypto/lhash/lh_test.c head/crypto/openssl/crypto/lhash/lhash.h head/crypto/openssl/crypto/lhash/num.pl head/crypto/openssl/crypto/md2/Makefile head/crypto/openssl/crypto/md2/md2.c head/crypto/openssl/crypto/md2/md2.h head/crypto/openssl/crypto/md2/md2test.c head/crypto/openssl/crypto/md32_common.h head/crypto/openssl/crypto/md4/Makefile head/crypto/openssl/crypto/md4/md4.c head/crypto/openssl/crypto/md4/md4.h head/crypto/openssl/crypto/md4/md4test.c head/crypto/openssl/crypto/md5/Makefile head/crypto/openssl/crypto/md5/asm/md5-ia64.S head/crypto/openssl/crypto/md5/md5.c head/crypto/openssl/crypto/md5/md5.h head/crypto/openssl/crypto/md5/md5test.c head/crypto/openssl/crypto/mdc2/Makefile head/crypto/openssl/crypto/mdc2/mdc2.h head/crypto/openssl/crypto/mdc2/mdc2test.c head/crypto/openssl/crypto/modes/Makefile head/crypto/openssl/crypto/modes/modes.h head/crypto/openssl/crypto/o_dir.h head/crypto/openssl/crypto/o_dir_test.c head/crypto/openssl/crypto/o_str.h head/crypto/openssl/crypto/o_time.h head/crypto/openssl/crypto/objects/Makefile head/crypto/openssl/crypto/objects/obj_mac.h head/crypto/openssl/crypto/objects/objects.README head/crypto/openssl/crypto/objects/objects.h head/crypto/openssl/crypto/ocsp/Makefile head/crypto/openssl/crypto/ocsp/ocsp.h head/crypto/openssl/crypto/opensslconf.h head/crypto/openssl/crypto/opensslconf.h.in head/crypto/openssl/crypto/opensslv.h head/crypto/openssl/crypto/ossl_typ.h head/crypto/openssl/crypto/pem/Makefile head/crypto/openssl/crypto/pem/message head/crypto/openssl/crypto/pem/pem.h head/crypto/openssl/crypto/pem/pem2.h head/crypto/openssl/crypto/pem/pem_seal.c head/crypto/openssl/crypto/pem/pkcs7.lis head/crypto/openssl/crypto/perlasm/readme head/crypto/openssl/crypto/pkcs12/Makefile head/crypto/openssl/crypto/pkcs12/pkcs12.h head/crypto/openssl/crypto/pkcs7/Makefile head/crypto/openssl/crypto/pkcs7/pk7_dgst.c head/crypto/openssl/crypto/pkcs7/pk7_enc.c head/crypto/openssl/crypto/pkcs7/pkcs7.h head/crypto/openssl/crypto/pqueue/ head/crypto/openssl/crypto/rand/Makefile head/crypto/openssl/crypto/rand/md_rand.c head/crypto/openssl/crypto/rand/rand.h head/crypto/openssl/crypto/rand/randtest.c head/crypto/openssl/crypto/rc2/Makefile head/crypto/openssl/crypto/rc2/rc2.h head/crypto/openssl/crypto/rc2/rc2speed.c head/crypto/openssl/crypto/rc2/rc2test.c head/crypto/openssl/crypto/rc2/rrc2.doc head/crypto/openssl/crypto/rc2/tab.c head/crypto/openssl/crypto/rc2/version head/crypto/openssl/crypto/rc4/Makefile head/crypto/openssl/crypto/rc4/asm/rc4-ia64.pl head/crypto/openssl/crypto/rc4/rc4.c head/crypto/openssl/crypto/rc4/rc4.h head/crypto/openssl/crypto/rc4/rc4_utl.c head/crypto/openssl/crypto/rc4/rc4speed.c head/crypto/openssl/crypto/rc4/rc4test.c head/crypto/openssl/crypto/rc4/rrc4.doc head/crypto/openssl/crypto/rc5/Makefile head/crypto/openssl/crypto/rc5/rc5.h head/crypto/openssl/crypto/rc5/rc5speed.c head/crypto/openssl/crypto/rc5/rc5test.c head/crypto/openssl/crypto/ripemd/Makefile head/crypto/openssl/crypto/ripemd/README head/crypto/openssl/crypto/ripemd/ripemd.h head/crypto/openssl/crypto/ripemd/rmd160.c head/crypto/openssl/crypto/ripemd/rmdtest.c head/crypto/openssl/crypto/rsa/Makefile head/crypto/openssl/crypto/rsa/rsa.h head/crypto/openssl/crypto/rsa/rsa_eay.c head/crypto/openssl/crypto/rsa/rsa_null.c head/crypto/openssl/crypto/rsa/rsa_test.c head/crypto/openssl/crypto/s390xcpuid.S head/crypto/openssl/crypto/seed/Makefile head/crypto/openssl/crypto/seed/seed.h head/crypto/openssl/crypto/sha/Makefile head/crypto/openssl/crypto/sha/asm/README head/crypto/openssl/crypto/sha/sha.c head/crypto/openssl/crypto/sha/sha.h head/crypto/openssl/crypto/sha/sha1.c head/crypto/openssl/crypto/sha/sha1test.c head/crypto/openssl/crypto/sha/sha256t.c head/crypto/openssl/crypto/sha/sha512t.c head/crypto/openssl/crypto/sha/sha_dgst.c head/crypto/openssl/crypto/sha/sha_one.c head/crypto/openssl/crypto/sha/shatest.c head/crypto/openssl/crypto/srp/Makefile head/crypto/openssl/crypto/srp/srp.h head/crypto/openssl/crypto/srp/srp_grps.h head/crypto/openssl/crypto/srp/srp_lcl.h head/crypto/openssl/crypto/srp/srptest.c head/crypto/openssl/crypto/stack/Makefile head/crypto/openssl/crypto/stack/safestack.h head/crypto/openssl/crypto/stack/stack.h head/crypto/openssl/crypto/store/Makefile head/crypto/openssl/crypto/store/README head/crypto/openssl/crypto/store/store.h head/crypto/openssl/crypto/store/str_err.c head/crypto/openssl/crypto/store/str_lib.c head/crypto/openssl/crypto/store/str_locl.h head/crypto/openssl/crypto/store/str_mem.c head/crypto/openssl/crypto/store/str_meth.c head/crypto/openssl/crypto/symhacks.h head/crypto/openssl/crypto/threads/ head/crypto/openssl/crypto/ts/Makefile head/crypto/openssl/crypto/ts/ts.h head/crypto/openssl/crypto/txt_db/Makefile head/crypto/openssl/crypto/txt_db/txt_db.h head/crypto/openssl/crypto/ui/Makefile head/crypto/openssl/crypto/ui/ui.h head/crypto/openssl/crypto/ui/ui_compat.c head/crypto/openssl/crypto/ui/ui_compat.h head/crypto/openssl/crypto/whrlpool/Makefile head/crypto/openssl/crypto/whrlpool/whrlpool.h head/crypto/openssl/crypto/whrlpool/wp_test.c head/crypto/openssl/crypto/x509/Makefile head/crypto/openssl/crypto/x509/verify_extra_test.c head/crypto/openssl/crypto/x509/vpm_int.h head/crypto/openssl/crypto/x509/x509.h head/crypto/openssl/crypto/x509/x509_vfy.h head/crypto/openssl/crypto/x509v3/Makefile head/crypto/openssl/crypto/x509v3/tabtest.c head/crypto/openssl/crypto/x509v3/v3_ocsp.c head/crypto/openssl/crypto/x509v3/v3_scts.c head/crypto/openssl/crypto/x509v3/v3conf.c head/crypto/openssl/crypto/x509v3/v3nametest.c head/crypto/openssl/crypto/x509v3/v3prin.c head/crypto/openssl/crypto/x509v3/x509v3.h head/crypto/openssl/doc/apps/ head/crypto/openssl/doc/c-indentation.el head/crypto/openssl/doc/crypto/ head/crypto/openssl/doc/openssl-shared.txt head/crypto/openssl/doc/openssl.txt head/crypto/openssl/doc/ssl/ head/crypto/openssl/doc/ssleay.txt head/crypto/openssl/doc/standards.txt head/crypto/openssl/e_os2.h head/crypto/openssl/engines/Makefile head/crypto/openssl/engines/ccgost/ head/crypto/openssl/engines/e_4758cca.c head/crypto/openssl/engines/e_4758cca_err.c head/crypto/openssl/engines/e_4758cca_err.h head/crypto/openssl/engines/e_aep.c head/crypto/openssl/engines/e_aep_err.c head/crypto/openssl/engines/e_aep_err.h head/crypto/openssl/engines/e_atalla.c head/crypto/openssl/engines/e_atalla_err.c head/crypto/openssl/engines/e_atalla_err.h head/crypto/openssl/engines/e_chil.c head/crypto/openssl/engines/e_chil_err.c head/crypto/openssl/engines/e_chil_err.h head/crypto/openssl/engines/e_cswift.c head/crypto/openssl/engines/e_cswift_err.c head/crypto/openssl/engines/e_cswift_err.h head/crypto/openssl/engines/e_gmp.c head/crypto/openssl/engines/e_gmp_err.c head/crypto/openssl/engines/e_gmp_err.h head/crypto/openssl/engines/e_nuron.c head/crypto/openssl/engines/e_nuron_err.c head/crypto/openssl/engines/e_nuron_err.h head/crypto/openssl/engines/e_sureware.c head/crypto/openssl/engines/e_sureware_err.c head/crypto/openssl/engines/e_sureware_err.h head/crypto/openssl/engines/e_ubsec.c head/crypto/openssl/engines/e_ubsec_err.c head/crypto/openssl/engines/e_ubsec_err.h head/crypto/openssl/engines/engine_vector.mar head/crypto/openssl/engines/vendor_defns/ head/crypto/openssl/shlib/ head/crypto/openssl/ssl/Makefile head/crypto/openssl/ssl/bad_dtls_test.c head/crypto/openssl/ssl/clienthellotest.c head/crypto/openssl/ssl/d1_both.c head/crypto/openssl/ssl/d1_clnt.c head/crypto/openssl/ssl/d1_meth.c head/crypto/openssl/ssl/d1_pkt.c head/crypto/openssl/ssl/d1_srvr.c head/crypto/openssl/ssl/dtls1.h head/crypto/openssl/ssl/dtlstest.c head/crypto/openssl/ssl/fatalerrtest.c head/crypto/openssl/ssl/heartbeat_test.c head/crypto/openssl/ssl/kssl.c head/crypto/openssl/ssl/kssl.h head/crypto/openssl/ssl/kssl_lcl.h head/crypto/openssl/ssl/s23_clnt.c head/crypto/openssl/ssl/s23_lib.c head/crypto/openssl/ssl/s23_meth.c head/crypto/openssl/ssl/s23_pkt.c head/crypto/openssl/ssl/s23_srvr.c head/crypto/openssl/ssl/s2_clnt.c head/crypto/openssl/ssl/s2_enc.c head/crypto/openssl/ssl/s2_lib.c head/crypto/openssl/ssl/s2_meth.c head/crypto/openssl/ssl/s2_pkt.c head/crypto/openssl/ssl/s2_srvr.c head/crypto/openssl/ssl/s3_both.c head/crypto/openssl/ssl/s3_clnt.c head/crypto/openssl/ssl/s3_meth.c head/crypto/openssl/ssl/s3_pkt.c head/crypto/openssl/ssl/s3_srvr.c head/crypto/openssl/ssl/srtp.h head/crypto/openssl/ssl/ssl.h head/crypto/openssl/ssl/ssl2.h head/crypto/openssl/ssl/ssl23.h head/crypto/openssl/ssl/ssl3.h head/crypto/openssl/ssl/ssl_algs.c head/crypto/openssl/ssl/ssl_err2.c head/crypto/openssl/ssl/ssl_task.c head/crypto/openssl/ssl/ssltest.c head/crypto/openssl/ssl/sslv2conftest.c head/crypto/openssl/ssl/t1_clnt.c head/crypto/openssl/ssl/t1_ext.c head/crypto/openssl/ssl/t1_meth.c head/crypto/openssl/ssl/t1_reneg.c head/crypto/openssl/ssl/t1_srvr.c head/crypto/openssl/ssl/tls1.h head/crypto/openssl/util/ head/secure/lib/libcrypto/engines/lib4758cca/ head/secure/lib/libcrypto/engines/libaep/ head/secure/lib/libcrypto/engines/libatalla/ head/secure/lib/libcrypto/engines/libcapi/ head/secure/lib/libcrypto/engines/libchil/ head/secure/lib/libcrypto/engines/libcswift/ head/secure/lib/libcrypto/engines/libgost/ head/secure/lib/libcrypto/engines/libnuron/ head/secure/lib/libcrypto/engines/libsureware/ head/secure/lib/libcrypto/engines/libubsec/ head/secure/lib/libcrypto/i386/bf-686.S head/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3 head/secure/lib/libcrypto/man/DH_get_ex_new_index.3 head/secure/lib/libcrypto/man/DSA_get_ex_new_index.3 head/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest.3 head/secure/lib/libcrypto/man/RSA_get_ex_new_index.3 head/secure/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3 head/secure/lib/libcrypto/man/bio.3 head/secure/lib/libcrypto/man/blowfish.3 head/secure/lib/libcrypto/man/bn.3 head/secure/lib/libcrypto/man/bn_internal.3 head/secure/lib/libcrypto/man/buffer.3 head/secure/lib/libcrypto/man/crypto.3 head/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3 head/secure/lib/libcrypto/man/d2i_CMS_ContentInfo.3 head/secure/lib/libcrypto/man/d2i_DSAPublicKey.3 head/secure/lib/libcrypto/man/d2i_ECPKParameters.3 head/secure/lib/libcrypto/man/d2i_ECPrivateKey.3 head/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3 head/secure/lib/libcrypto/man/d2i_RSAPublicKey.3 head/secure/lib/libcrypto/man/d2i_X509_ALGOR.3 head/secure/lib/libcrypto/man/d2i_X509_CRL.3 head/secure/lib/libcrypto/man/d2i_X509_NAME.3 head/secure/lib/libcrypto/man/d2i_X509_REQ.3 head/secure/lib/libcrypto/man/d2i_X509_SIG.3 head/secure/lib/libcrypto/man/des.3 head/secure/lib/libcrypto/man/dh.3 head/secure/lib/libcrypto/man/dsa.3 head/secure/lib/libcrypto/man/ec.3 head/secure/lib/libcrypto/man/ecdsa.3 head/secure/lib/libcrypto/man/engine.3 head/secure/lib/libcrypto/man/err.3 head/secure/lib/libcrypto/man/evp.3 head/secure/lib/libcrypto/man/hmac.3 head/secure/lib/libcrypto/man/lh_stats.3 head/secure/lib/libcrypto/man/lhash.3 head/secure/lib/libcrypto/man/md5.3 head/secure/lib/libcrypto/man/mdc2.3 head/secure/lib/libcrypto/man/pem.3 head/secure/lib/libcrypto/man/rand.3 head/secure/lib/libcrypto/man/rc4.3 head/secure/lib/libcrypto/man/ripemd.3 head/secure/lib/libcrypto/man/rsa.3 head/secure/lib/libcrypto/man/sha.3 head/secure/lib/libcrypto/man/threads.3 head/secure/lib/libcrypto/man/ui.3 head/secure/lib/libcrypto/man/ui_compat.3 head/secure/lib/libcrypto/man/x509.3 head/secure/lib/libcrypto/opensslconf-aarch64.h.in head/secure/lib/libcrypto/opensslconf-arm.h.in head/secure/lib/libcrypto/opensslconf-mips.h.in head/secure/lib/libcrypto/opensslconf-powerpc.h.in head/secure/lib/libcrypto/opensslconf-riscv.h.in head/secure/lib/libcrypto/opensslconf-sparc64.h.in head/secure/lib/libcrypto/opensslconf-x86.h.in head/secure/lib/libssl/Makefile.man head/secure/lib/libssl/man/ head/secure/usr.bin/openssl/man/x509v3_config.1 Modified: head/ObsoleteFiles.inc head/UPDATING head/contrib/bsnmp/lib/snmpcrypto.c head/contrib/dma/crypto.c head/contrib/dma/dma-mbox-create.c head/contrib/dma/local.c head/contrib/dma/mail.c head/contrib/dma/net.c head/contrib/dma/spool.c head/contrib/dma/util.c head/contrib/ldns/ldns/config.h head/contrib/openbsm/bin/auditdistd/proto_tls.c head/contrib/telnet/libtelnet/enc_des.c head/contrib/telnet/libtelnet/encrypt.h head/contrib/telnet/libtelnet/kerberos.c head/contrib/telnet/libtelnet/pk.c head/contrib/telnet/libtelnet/pk.h head/contrib/unbound/config.h head/crypto/heimdal/kdc/digest.c head/crypto/heimdal/kdc/kx509.c head/crypto/heimdal/kdc/pkinit.c head/crypto/heimdal/lib/gssapi/krb5/arcfour.c head/crypto/heimdal/lib/gssapi/krb5/get_mic.c head/crypto/heimdal/lib/gssapi/krb5/unwrap.c head/crypto/heimdal/lib/gssapi/krb5/verify_mic.c head/crypto/heimdal/lib/gssapi/krb5/wrap.c head/crypto/heimdal/lib/gssapi/ntlm/crypto.c head/crypto/heimdal/lib/hx509/crypto.c head/crypto/heimdal/lib/hx509/hxtool.c head/crypto/heimdal/lib/hx509/ks_file.c head/crypto/heimdal/lib/hx509/ks_p11.c head/crypto/heimdal/lib/krb5/crypto-aes.c head/crypto/heimdal/lib/krb5/crypto-arcfour.c head/crypto/heimdal/lib/krb5/crypto-des-common.c head/crypto/heimdal/lib/krb5/crypto-des.c head/crypto/heimdal/lib/krb5/crypto-evp.c head/crypto/heimdal/lib/krb5/crypto-rand.c head/crypto/heimdal/lib/krb5/crypto.h head/crypto/heimdal/lib/krb5/pkinit.c head/crypto/heimdal/lib/ntlm/heimntlm-protos.h head/crypto/heimdal/lib/ntlm/ntlm.c head/crypto/heimdal/lib/roken/snprintf.c head/crypto/openssh/config.h head/crypto/openssh/ssh_namespace.h head/crypto/openssl/CHANGES head/crypto/openssl/CONTRIBUTING head/crypto/openssl/Configure head/crypto/openssl/INSTALL head/crypto/openssl/LICENSE head/crypto/openssl/NEWS head/crypto/openssl/README head/crypto/openssl/README.ENGINE head/crypto/openssl/apps/CA.pl.in head/crypto/openssl/apps/app_rand.c head/crypto/openssl/apps/apps.c head/crypto/openssl/apps/apps.h head/crypto/openssl/apps/asn1pars.c head/crypto/openssl/apps/ca-key.pem head/crypto/openssl/apps/ca-req.pem head/crypto/openssl/apps/ca.c head/crypto/openssl/apps/ciphers.c head/crypto/openssl/apps/cms.c head/crypto/openssl/apps/crl.c head/crypto/openssl/apps/crl2p7.c head/crypto/openssl/apps/dgst.c head/crypto/openssl/apps/dh1024.pem head/crypto/openssl/apps/dh2048.pem head/crypto/openssl/apps/dh4096.pem head/crypto/openssl/apps/dhparam.c head/crypto/openssl/apps/dsa-ca.pem head/crypto/openssl/apps/dsa-pca.pem head/crypto/openssl/apps/dsa.c head/crypto/openssl/apps/dsaparam.c head/crypto/openssl/apps/ec.c head/crypto/openssl/apps/ecparam.c head/crypto/openssl/apps/enc.c head/crypto/openssl/apps/engine.c head/crypto/openssl/apps/errstr.c head/crypto/openssl/apps/gendsa.c head/crypto/openssl/apps/genpkey.c head/crypto/openssl/apps/genrsa.c head/crypto/openssl/apps/nseq.c head/crypto/openssl/apps/ocsp.c head/crypto/openssl/apps/openssl.c head/crypto/openssl/apps/openssl.cnf head/crypto/openssl/apps/passwd.c head/crypto/openssl/apps/pca-key.pem head/crypto/openssl/apps/pca-req.pem head/crypto/openssl/apps/pkcs12.c head/crypto/openssl/apps/pkcs7.c head/crypto/openssl/apps/pkcs8.c head/crypto/openssl/apps/pkey.c head/crypto/openssl/apps/pkeyparam.c head/crypto/openssl/apps/pkeyutl.c head/crypto/openssl/apps/prime.c head/crypto/openssl/apps/privkey.pem head/crypto/openssl/apps/progs.pl head/crypto/openssl/apps/rand.c head/crypto/openssl/apps/req.c head/crypto/openssl/apps/rsa.c head/crypto/openssl/apps/rsautl.c head/crypto/openssl/apps/s_apps.h head/crypto/openssl/apps/s_cb.c head/crypto/openssl/apps/s_client.c head/crypto/openssl/apps/s_server.c head/crypto/openssl/apps/s_socket.c head/crypto/openssl/apps/s_time.c head/crypto/openssl/apps/sess_id.c head/crypto/openssl/apps/smime.c head/crypto/openssl/apps/speed.c head/crypto/openssl/apps/spkac.c head/crypto/openssl/apps/srp.c head/crypto/openssl/apps/testdsa.h head/crypto/openssl/apps/testrsa.h head/crypto/openssl/apps/timeouts.h head/crypto/openssl/apps/ts.c head/crypto/openssl/apps/verify.c head/crypto/openssl/apps/version.c head/crypto/openssl/apps/x509.c head/crypto/openssl/appveyor.yml head/crypto/openssl/config head/crypto/openssl/crypto/LPdir_unix.c head/crypto/openssl/crypto/aes/aes_cbc.c head/crypto/openssl/crypto/aes/aes_cfb.c head/crypto/openssl/crypto/aes/aes_core.c head/crypto/openssl/crypto/aes/aes_ecb.c head/crypto/openssl/crypto/aes/aes_ige.c head/crypto/openssl/crypto/aes/aes_locl.h head/crypto/openssl/crypto/aes/aes_misc.c head/crypto/openssl/crypto/aes/aes_ofb.c head/crypto/openssl/crypto/aes/aes_wrap.c head/crypto/openssl/crypto/aes/aes_x86core.c head/crypto/openssl/crypto/aes/asm/aes-586.pl head/crypto/openssl/crypto/aes/asm/aes-armv4.pl head/crypto/openssl/crypto/aes/asm/aes-ia64.S head/crypto/openssl/crypto/aes/asm/aes-mips.pl head/crypto/openssl/crypto/aes/asm/aes-parisc.pl head/crypto/openssl/crypto/aes/asm/aes-ppc.pl head/crypto/openssl/crypto/aes/asm/aes-s390x.pl head/crypto/openssl/crypto/aes/asm/aes-sparcv9.pl head/crypto/openssl/crypto/aes/asm/aes-x86_64.pl head/crypto/openssl/crypto/aes/asm/aesni-mb-x86_64.pl head/crypto/openssl/crypto/aes/asm/aesni-sha1-x86_64.pl head/crypto/openssl/crypto/aes/asm/aesni-sha256-x86_64.pl head/crypto/openssl/crypto/aes/asm/aesni-x86.pl head/crypto/openssl/crypto/aes/asm/aesni-x86_64.pl head/crypto/openssl/crypto/aes/asm/aesp8-ppc.pl head/crypto/openssl/crypto/aes/asm/aest4-sparcv9.pl head/crypto/openssl/crypto/aes/asm/aesv8-armx.pl head/crypto/openssl/crypto/aes/asm/bsaes-armv7.pl head/crypto/openssl/crypto/aes/asm/bsaes-x86_64.pl head/crypto/openssl/crypto/aes/asm/vpaes-ppc.pl head/crypto/openssl/crypto/aes/asm/vpaes-x86.pl head/crypto/openssl/crypto/aes/asm/vpaes-x86_64.pl head/crypto/openssl/crypto/arm_arch.h head/crypto/openssl/crypto/armcap.c head/crypto/openssl/crypto/asn1/a_bitstr.c head/crypto/openssl/crypto/asn1/a_d2i_fp.c head/crypto/openssl/crypto/asn1/a_digest.c head/crypto/openssl/crypto/asn1/a_dup.c head/crypto/openssl/crypto/asn1/a_gentm.c head/crypto/openssl/crypto/asn1/a_i2d_fp.c head/crypto/openssl/crypto/asn1/a_int.c head/crypto/openssl/crypto/asn1/a_mbstr.c head/crypto/openssl/crypto/asn1/a_object.c head/crypto/openssl/crypto/asn1/a_octet.c head/crypto/openssl/crypto/asn1/a_print.c head/crypto/openssl/crypto/asn1/a_sign.c head/crypto/openssl/crypto/asn1/a_strex.c head/crypto/openssl/crypto/asn1/a_strnid.c head/crypto/openssl/crypto/asn1/a_time.c head/crypto/openssl/crypto/asn1/a_type.c head/crypto/openssl/crypto/asn1/a_utctm.c head/crypto/openssl/crypto/asn1/a_utf8.c head/crypto/openssl/crypto/asn1/a_verify.c head/crypto/openssl/crypto/asn1/ameth_lib.c head/crypto/openssl/crypto/asn1/asn1_err.c head/crypto/openssl/crypto/asn1/asn1_gen.c head/crypto/openssl/crypto/asn1/asn1_lib.c head/crypto/openssl/crypto/asn1/asn1_locl.h head/crypto/openssl/crypto/asn1/asn1_par.c head/crypto/openssl/crypto/asn1/asn_mime.c head/crypto/openssl/crypto/asn1/asn_moid.c head/crypto/openssl/crypto/asn1/asn_pack.c head/crypto/openssl/crypto/asn1/bio_asn1.c head/crypto/openssl/crypto/asn1/bio_ndef.c head/crypto/openssl/crypto/asn1/charmap.h head/crypto/openssl/crypto/asn1/charmap.pl head/crypto/openssl/crypto/asn1/d2i_pr.c head/crypto/openssl/crypto/asn1/d2i_pu.c head/crypto/openssl/crypto/asn1/evp_asn1.c head/crypto/openssl/crypto/asn1/f_int.c head/crypto/openssl/crypto/asn1/f_string.c head/crypto/openssl/crypto/asn1/i2d_pr.c head/crypto/openssl/crypto/asn1/i2d_pu.c head/crypto/openssl/crypto/asn1/n_pkey.c head/crypto/openssl/crypto/asn1/nsseq.c head/crypto/openssl/crypto/asn1/p5_pbe.c head/crypto/openssl/crypto/asn1/p5_pbev2.c head/crypto/openssl/crypto/asn1/p8_pkey.c head/crypto/openssl/crypto/asn1/t_bitst.c head/crypto/openssl/crypto/asn1/t_pkey.c head/crypto/openssl/crypto/asn1/t_spki.c head/crypto/openssl/crypto/asn1/tasn_dec.c head/crypto/openssl/crypto/asn1/tasn_enc.c head/crypto/openssl/crypto/asn1/tasn_fre.c head/crypto/openssl/crypto/asn1/tasn_new.c head/crypto/openssl/crypto/asn1/tasn_prn.c head/crypto/openssl/crypto/asn1/tasn_typ.c head/crypto/openssl/crypto/asn1/tasn_utl.c head/crypto/openssl/crypto/asn1/x_algor.c head/crypto/openssl/crypto/asn1/x_bignum.c head/crypto/openssl/crypto/asn1/x_info.c head/crypto/openssl/crypto/asn1/x_long.c head/crypto/openssl/crypto/asn1/x_pkey.c head/crypto/openssl/crypto/asn1/x_sig.c head/crypto/openssl/crypto/asn1/x_spki.c head/crypto/openssl/crypto/asn1/x_val.c head/crypto/openssl/crypto/bf/asm/bf-586.pl head/crypto/openssl/crypto/bf/bf_cfb64.c head/crypto/openssl/crypto/bf/bf_ecb.c head/crypto/openssl/crypto/bf/bf_enc.c head/crypto/openssl/crypto/bf/bf_locl.h head/crypto/openssl/crypto/bf/bf_ofb64.c head/crypto/openssl/crypto/bf/bf_pi.h head/crypto/openssl/crypto/bf/bf_skey.c head/crypto/openssl/crypto/bio/b_dump.c head/crypto/openssl/crypto/bio/b_print.c head/crypto/openssl/crypto/bio/b_sock.c head/crypto/openssl/crypto/bio/bf_buff.c head/crypto/openssl/crypto/bio/bf_lbuf.c head/crypto/openssl/crypto/bio/bf_nbio.c head/crypto/openssl/crypto/bio/bf_null.c head/crypto/openssl/crypto/bio/bio_cb.c head/crypto/openssl/crypto/bio/bio_err.c head/crypto/openssl/crypto/bio/bio_lcl.h head/crypto/openssl/crypto/bio/bio_lib.c head/crypto/openssl/crypto/bio/bss_acpt.c head/crypto/openssl/crypto/bio/bss_bio.c head/crypto/openssl/crypto/bio/bss_conn.c head/crypto/openssl/crypto/bio/bss_dgram.c head/crypto/openssl/crypto/bio/bss_fd.c head/crypto/openssl/crypto/bio/bss_file.c head/crypto/openssl/crypto/bio/bss_log.c head/crypto/openssl/crypto/bio/bss_mem.c head/crypto/openssl/crypto/bio/bss_null.c head/crypto/openssl/crypto/bio/bss_sock.c head/crypto/openssl/crypto/bn/asm/armv4-gf2m.pl head/crypto/openssl/crypto/bn/asm/armv4-mont.pl head/crypto/openssl/crypto/bn/asm/bn-586.pl head/crypto/openssl/crypto/bn/asm/co-586.pl head/crypto/openssl/crypto/bn/asm/ia64-mont.pl head/crypto/openssl/crypto/bn/asm/ia64.S head/crypto/openssl/crypto/bn/asm/mips-mont.pl head/crypto/openssl/crypto/bn/asm/mips.pl head/crypto/openssl/crypto/bn/asm/parisc-mont.pl head/crypto/openssl/crypto/bn/asm/ppc-mont.pl head/crypto/openssl/crypto/bn/asm/ppc.pl head/crypto/openssl/crypto/bn/asm/ppc64-mont.pl head/crypto/openssl/crypto/bn/asm/rsaz-avx2.pl head/crypto/openssl/crypto/bn/asm/rsaz-x86_64.pl head/crypto/openssl/crypto/bn/asm/s390x-gf2m.pl head/crypto/openssl/crypto/bn/asm/s390x-mont.pl head/crypto/openssl/crypto/bn/asm/s390x.S head/crypto/openssl/crypto/bn/asm/sparct4-mont.pl head/crypto/openssl/crypto/bn/asm/sparcv8.S head/crypto/openssl/crypto/bn/asm/sparcv8plus.S head/crypto/openssl/crypto/bn/asm/sparcv9-gf2m.pl head/crypto/openssl/crypto/bn/asm/sparcv9-mont.pl head/crypto/openssl/crypto/bn/asm/sparcv9a-mont.pl head/crypto/openssl/crypto/bn/asm/via-mont.pl head/crypto/openssl/crypto/bn/asm/vis3-mont.pl head/crypto/openssl/crypto/bn/asm/x86-gf2m.pl head/crypto/openssl/crypto/bn/asm/x86-mont.pl head/crypto/openssl/crypto/bn/asm/x86_64-gcc.c head/crypto/openssl/crypto/bn/asm/x86_64-gf2m.pl head/crypto/openssl/crypto/bn/asm/x86_64-mont.pl head/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl head/crypto/openssl/crypto/bn/bn_add.c head/crypto/openssl/crypto/bn/bn_asm.c head/crypto/openssl/crypto/bn/bn_blind.c head/crypto/openssl/crypto/bn/bn_const.c head/crypto/openssl/crypto/bn/bn_ctx.c head/crypto/openssl/crypto/bn/bn_depr.c head/crypto/openssl/crypto/bn/bn_div.c head/crypto/openssl/crypto/bn/bn_err.c head/crypto/openssl/crypto/bn/bn_exp.c head/crypto/openssl/crypto/bn/bn_exp2.c head/crypto/openssl/crypto/bn/bn_gcd.c head/crypto/openssl/crypto/bn/bn_gf2m.c head/crypto/openssl/crypto/bn/bn_kron.c head/crypto/openssl/crypto/bn/bn_lcl.h head/crypto/openssl/crypto/bn/bn_lib.c head/crypto/openssl/crypto/bn/bn_mod.c head/crypto/openssl/crypto/bn/bn_mont.c head/crypto/openssl/crypto/bn/bn_mpi.c head/crypto/openssl/crypto/bn/bn_mul.c head/crypto/openssl/crypto/bn/bn_nist.c head/crypto/openssl/crypto/bn/bn_prime.c head/crypto/openssl/crypto/bn/bn_prime.h head/crypto/openssl/crypto/bn/bn_prime.pl head/crypto/openssl/crypto/bn/bn_print.c head/crypto/openssl/crypto/bn/bn_rand.c head/crypto/openssl/crypto/bn/bn_recp.c head/crypto/openssl/crypto/bn/bn_shift.c head/crypto/openssl/crypto/bn/bn_sqr.c head/crypto/openssl/crypto/bn/bn_sqrt.c head/crypto/openssl/crypto/bn/bn_word.c head/crypto/openssl/crypto/bn/bn_x931p.c head/crypto/openssl/crypto/bn/rsaz_exp.c head/crypto/openssl/crypto/bn/rsaz_exp.h head/crypto/openssl/crypto/buffer/buf_err.c head/crypto/openssl/crypto/buffer/buffer.c head/crypto/openssl/crypto/camellia/asm/cmll-x86.pl head/crypto/openssl/crypto/camellia/asm/cmll-x86_64.pl head/crypto/openssl/crypto/camellia/asm/cmllt4-sparcv9.pl head/crypto/openssl/crypto/camellia/camellia.c head/crypto/openssl/crypto/camellia/cmll_cbc.c head/crypto/openssl/crypto/camellia/cmll_cfb.c head/crypto/openssl/crypto/camellia/cmll_ctr.c head/crypto/openssl/crypto/camellia/cmll_ecb.c head/crypto/openssl/crypto/camellia/cmll_locl.h head/crypto/openssl/crypto/camellia/cmll_misc.c head/crypto/openssl/crypto/camellia/cmll_ofb.c head/crypto/openssl/crypto/cast/asm/cast-586.pl head/crypto/openssl/crypto/cast/c_cfb64.c head/crypto/openssl/crypto/cast/c_ecb.c head/crypto/openssl/crypto/cast/c_enc.c head/crypto/openssl/crypto/cast/c_ofb64.c head/crypto/openssl/crypto/cast/c_skey.c head/crypto/openssl/crypto/cast/cast_lcl.h head/crypto/openssl/crypto/cast/cast_s.h head/crypto/openssl/crypto/cmac/cm_ameth.c head/crypto/openssl/crypto/cmac/cm_pmeth.c head/crypto/openssl/crypto/cmac/cmac.c head/crypto/openssl/crypto/cms/cms_asn1.c head/crypto/openssl/crypto/cms/cms_att.c head/crypto/openssl/crypto/cms/cms_cd.c head/crypto/openssl/crypto/cms/cms_dd.c head/crypto/openssl/crypto/cms/cms_enc.c head/crypto/openssl/crypto/cms/cms_env.c head/crypto/openssl/crypto/cms/cms_err.c head/crypto/openssl/crypto/cms/cms_ess.c head/crypto/openssl/crypto/cms/cms_io.c head/crypto/openssl/crypto/cms/cms_kari.c head/crypto/openssl/crypto/cms/cms_lcl.h head/crypto/openssl/crypto/cms/cms_lib.c head/crypto/openssl/crypto/cms/cms_pwri.c head/crypto/openssl/crypto/cms/cms_sd.c head/crypto/openssl/crypto/cms/cms_smime.c head/crypto/openssl/crypto/comp/c_zlib.c head/crypto/openssl/crypto/comp/comp_err.c head/crypto/openssl/crypto/comp/comp_lib.c head/crypto/openssl/crypto/conf/conf_api.c head/crypto/openssl/crypto/conf/conf_def.c head/crypto/openssl/crypto/conf/conf_def.h head/crypto/openssl/crypto/conf/conf_err.c head/crypto/openssl/crypto/conf/conf_lib.c head/crypto/openssl/crypto/conf/conf_mall.c head/crypto/openssl/crypto/conf/conf_mod.c head/crypto/openssl/crypto/conf/conf_sap.c head/crypto/openssl/crypto/conf/keysets.pl head/crypto/openssl/crypto/cpt_err.c head/crypto/openssl/crypto/cryptlib.c head/crypto/openssl/crypto/cversion.c head/crypto/openssl/crypto/des/asm/crypt586.pl head/crypto/openssl/crypto/des/asm/des-586.pl head/crypto/openssl/crypto/des/asm/des_enc.m4 head/crypto/openssl/crypto/des/asm/desboth.pl head/crypto/openssl/crypto/des/asm/dest4-sparcv9.pl head/crypto/openssl/crypto/des/cbc_cksm.c head/crypto/openssl/crypto/des/cbc_enc.c head/crypto/openssl/crypto/des/cfb64ede.c head/crypto/openssl/crypto/des/cfb64enc.c head/crypto/openssl/crypto/des/cfb_enc.c head/crypto/openssl/crypto/des/des_enc.c head/crypto/openssl/crypto/des/des_locl.h head/crypto/openssl/crypto/des/ecb3_enc.c head/crypto/openssl/crypto/des/ecb_enc.c head/crypto/openssl/crypto/des/fcrypt.c head/crypto/openssl/crypto/des/fcrypt_b.c head/crypto/openssl/crypto/des/ncbc_enc.c head/crypto/openssl/crypto/des/ofb64ede.c head/crypto/openssl/crypto/des/ofb64enc.c head/crypto/openssl/crypto/des/ofb_enc.c head/crypto/openssl/crypto/des/pcbc_enc.c head/crypto/openssl/crypto/des/qud_cksm.c head/crypto/openssl/crypto/des/rand_key.c head/crypto/openssl/crypto/des/set_key.c head/crypto/openssl/crypto/des/spr.h head/crypto/openssl/crypto/des/str2key.c head/crypto/openssl/crypto/des/xcbc_enc.c head/crypto/openssl/crypto/dh/dh_ameth.c head/crypto/openssl/crypto/dh/dh_asn1.c head/crypto/openssl/crypto/dh/dh_check.c head/crypto/openssl/crypto/dh/dh_depr.c head/crypto/openssl/crypto/dh/dh_err.c head/crypto/openssl/crypto/dh/dh_gen.c head/crypto/openssl/crypto/dh/dh_kdf.c head/crypto/openssl/crypto/dh/dh_key.c head/crypto/openssl/crypto/dh/dh_lib.c head/crypto/openssl/crypto/dh/dh_pmeth.c head/crypto/openssl/crypto/dh/dh_prn.c head/crypto/openssl/crypto/dh/dh_rfc5114.c head/crypto/openssl/crypto/dsa/dsa_ameth.c head/crypto/openssl/crypto/dsa/dsa_asn1.c head/crypto/openssl/crypto/dsa/dsa_depr.c head/crypto/openssl/crypto/dsa/dsa_err.c head/crypto/openssl/crypto/dsa/dsa_gen.c head/crypto/openssl/crypto/dsa/dsa_key.c head/crypto/openssl/crypto/dsa/dsa_lib.c head/crypto/openssl/crypto/dsa/dsa_locl.h head/crypto/openssl/crypto/dsa/dsa_ossl.c head/crypto/openssl/crypto/dsa/dsa_pmeth.c head/crypto/openssl/crypto/dsa/dsa_prn.c head/crypto/openssl/crypto/dsa/dsa_sign.c head/crypto/openssl/crypto/dsa/dsa_vrf.c head/crypto/openssl/crypto/dso/dso_dl.c head/crypto/openssl/crypto/dso/dso_dlfcn.c head/crypto/openssl/crypto/dso/dso_err.c head/crypto/openssl/crypto/dso/dso_lib.c head/crypto/openssl/crypto/dso/dso_openssl.c head/crypto/openssl/crypto/ebcdic.c head/crypto/openssl/crypto/ec/asm/ecp_nistz256-avx2.pl head/crypto/openssl/crypto/ec/asm/ecp_nistz256-x86_64.pl head/crypto/openssl/crypto/ec/ec2_oct.c head/crypto/openssl/crypto/ec/ec2_smpl.c head/crypto/openssl/crypto/ec/ec_ameth.c head/crypto/openssl/crypto/ec/ec_asn1.c head/crypto/openssl/crypto/ec/ec_check.c head/crypto/openssl/crypto/ec/ec_curve.c head/crypto/openssl/crypto/ec/ec_cvt.c head/crypto/openssl/crypto/ec/ec_err.c head/crypto/openssl/crypto/ec/ec_key.c head/crypto/openssl/crypto/ec/ec_lcl.h head/crypto/openssl/crypto/ec/ec_lib.c head/crypto/openssl/crypto/ec/ec_mult.c head/crypto/openssl/crypto/ec/ec_oct.c head/crypto/openssl/crypto/ec/ec_pmeth.c head/crypto/openssl/crypto/ec/ec_print.c head/crypto/openssl/crypto/ec/eck_prn.c head/crypto/openssl/crypto/ec/ecp_mont.c head/crypto/openssl/crypto/ec/ecp_nist.c head/crypto/openssl/crypto/ec/ecp_nistp224.c head/crypto/openssl/crypto/ec/ecp_nistp256.c head/crypto/openssl/crypto/ec/ecp_nistp521.c head/crypto/openssl/crypto/ec/ecp_nistputil.c head/crypto/openssl/crypto/ec/ecp_nistz256.c head/crypto/openssl/crypto/ec/ecp_nistz256_table.c head/crypto/openssl/crypto/ec/ecp_oct.c head/crypto/openssl/crypto/ec/ecp_smpl.c head/crypto/openssl/crypto/engine/README head/crypto/openssl/crypto/engine/eng_all.c head/crypto/openssl/crypto/engine/eng_cnf.c head/crypto/openssl/crypto/engine/eng_ctrl.c head/crypto/openssl/crypto/engine/eng_dyn.c head/crypto/openssl/crypto/engine/eng_err.c head/crypto/openssl/crypto/engine/eng_fat.c head/crypto/openssl/crypto/engine/eng_init.c head/crypto/openssl/crypto/engine/eng_int.h head/crypto/openssl/crypto/engine/eng_lib.c head/crypto/openssl/crypto/engine/eng_list.c head/crypto/openssl/crypto/engine/eng_openssl.c head/crypto/openssl/crypto/engine/eng_pkey.c head/crypto/openssl/crypto/engine/eng_rdrand.c head/crypto/openssl/crypto/engine/eng_table.c head/crypto/openssl/crypto/engine/tb_asnmth.c head/crypto/openssl/crypto/engine/tb_cipher.c head/crypto/openssl/crypto/engine/tb_dh.c head/crypto/openssl/crypto/engine/tb_digest.c head/crypto/openssl/crypto/engine/tb_dsa.c head/crypto/openssl/crypto/engine/tb_pkmeth.c head/crypto/openssl/crypto/engine/tb_rand.c head/crypto/openssl/crypto/engine/tb_rsa.c head/crypto/openssl/crypto/err/err.c head/crypto/openssl/crypto/err/err_all.c head/crypto/openssl/crypto/err/err_prn.c head/crypto/openssl/crypto/evp/bio_b64.c head/crypto/openssl/crypto/evp/bio_enc.c head/crypto/openssl/crypto/evp/bio_md.c head/crypto/openssl/crypto/evp/bio_ok.c head/crypto/openssl/crypto/evp/c_allc.c head/crypto/openssl/crypto/evp/c_alld.c head/crypto/openssl/crypto/evp/digest.c head/crypto/openssl/crypto/evp/e_aes.c head/crypto/openssl/crypto/evp/e_aes_cbc_hmac_sha1.c head/crypto/openssl/crypto/evp/e_aes_cbc_hmac_sha256.c head/crypto/openssl/crypto/evp/e_bf.c head/crypto/openssl/crypto/evp/e_camellia.c head/crypto/openssl/crypto/evp/e_cast.c head/crypto/openssl/crypto/evp/e_des.c head/crypto/openssl/crypto/evp/e_des3.c head/crypto/openssl/crypto/evp/e_idea.c head/crypto/openssl/crypto/evp/e_null.c head/crypto/openssl/crypto/evp/e_old.c head/crypto/openssl/crypto/evp/e_rc2.c head/crypto/openssl/crypto/evp/e_rc4.c head/crypto/openssl/crypto/evp/e_rc4_hmac_md5.c head/crypto/openssl/crypto/evp/e_rc5.c head/crypto/openssl/crypto/evp/e_seed.c head/crypto/openssl/crypto/evp/e_xcbc_d.c head/crypto/openssl/crypto/evp/encode.c head/crypto/openssl/crypto/evp/evp_cnf.c head/crypto/openssl/crypto/evp/evp_enc.c head/crypto/openssl/crypto/evp/evp_err.c head/crypto/openssl/crypto/evp/evp_key.c head/crypto/openssl/crypto/evp/evp_lib.c head/crypto/openssl/crypto/evp/evp_locl.h head/crypto/openssl/crypto/evp/evp_pbe.c head/crypto/openssl/crypto/evp/evp_pkey.c head/crypto/openssl/crypto/evp/m_md2.c head/crypto/openssl/crypto/evp/m_md4.c head/crypto/openssl/crypto/evp/m_md5.c head/crypto/openssl/crypto/evp/m_mdc2.c head/crypto/openssl/crypto/evp/m_null.c head/crypto/openssl/crypto/evp/m_ripemd.c head/crypto/openssl/crypto/evp/m_sha1.c head/crypto/openssl/crypto/evp/m_sigver.c head/crypto/openssl/crypto/evp/m_wp.c head/crypto/openssl/crypto/evp/names.c head/crypto/openssl/crypto/evp/p5_crpt.c head/crypto/openssl/crypto/evp/p5_crpt2.c head/crypto/openssl/crypto/evp/p_dec.c head/crypto/openssl/crypto/evp/p_enc.c head/crypto/openssl/crypto/evp/p_lib.c head/crypto/openssl/crypto/evp/p_open.c head/crypto/openssl/crypto/evp/p_seal.c head/crypto/openssl/crypto/evp/p_sign.c head/crypto/openssl/crypto/evp/p_verify.c head/crypto/openssl/crypto/evp/pmeth_fn.c head/crypto/openssl/crypto/evp/pmeth_gn.c head/crypto/openssl/crypto/evp/pmeth_lib.c head/crypto/openssl/crypto/ex_data.c head/crypto/openssl/crypto/hmac/hm_ameth.c head/crypto/openssl/crypto/hmac/hm_pmeth.c head/crypto/openssl/crypto/hmac/hmac.c head/crypto/openssl/crypto/ia64cpuid.S head/crypto/openssl/crypto/idea/i_cbc.c head/crypto/openssl/crypto/idea/i_cfb64.c head/crypto/openssl/crypto/idea/i_ecb.c head/crypto/openssl/crypto/idea/i_ofb64.c head/crypto/openssl/crypto/idea/i_skey.c head/crypto/openssl/crypto/idea/idea_lcl.h head/crypto/openssl/crypto/lhash/lh_stats.c head/crypto/openssl/crypto/lhash/lhash.c head/crypto/openssl/crypto/md2/md2_dgst.c head/crypto/openssl/crypto/md2/md2_one.c head/crypto/openssl/crypto/md4/md4_dgst.c head/crypto/openssl/crypto/md4/md4_locl.h head/crypto/openssl/crypto/md4/md4_one.c head/crypto/openssl/crypto/md5/asm/md5-586.pl head/crypto/openssl/crypto/md5/asm/md5-sparcv9.pl head/crypto/openssl/crypto/md5/asm/md5-x86_64.pl head/crypto/openssl/crypto/md5/md5_dgst.c head/crypto/openssl/crypto/md5/md5_locl.h head/crypto/openssl/crypto/md5/md5_one.c head/crypto/openssl/crypto/mdc2/mdc2_one.c head/crypto/openssl/crypto/mdc2/mdc2dgst.c head/crypto/openssl/crypto/mem.c head/crypto/openssl/crypto/mem_clr.c head/crypto/openssl/crypto/mem_dbg.c head/crypto/openssl/crypto/modes/asm/aesni-gcm-x86_64.pl head/crypto/openssl/crypto/modes/asm/ghash-armv4.pl head/crypto/openssl/crypto/modes/asm/ghash-ia64.pl head/crypto/openssl/crypto/modes/asm/ghash-parisc.pl head/crypto/openssl/crypto/modes/asm/ghash-s390x.pl head/crypto/openssl/crypto/modes/asm/ghash-sparcv9.pl head/crypto/openssl/crypto/modes/asm/ghash-x86.pl head/crypto/openssl/crypto/modes/asm/ghash-x86_64.pl head/crypto/openssl/crypto/modes/asm/ghashp8-ppc.pl head/crypto/openssl/crypto/modes/asm/ghashv8-armx.pl head/crypto/openssl/crypto/modes/cbc128.c head/crypto/openssl/crypto/modes/ccm128.c head/crypto/openssl/crypto/modes/cfb128.c head/crypto/openssl/crypto/modes/ctr128.c head/crypto/openssl/crypto/modes/cts128.c head/crypto/openssl/crypto/modes/gcm128.c head/crypto/openssl/crypto/modes/modes_lcl.h head/crypto/openssl/crypto/modes/ofb128.c head/crypto/openssl/crypto/modes/wrap128.c head/crypto/openssl/crypto/modes/xts128.c head/crypto/openssl/crypto/o_dir.c head/crypto/openssl/crypto/o_fips.c head/crypto/openssl/crypto/o_init.c head/crypto/openssl/crypto/o_str.c head/crypto/openssl/crypto/o_time.c head/crypto/openssl/crypto/objects/o_names.c head/crypto/openssl/crypto/objects/obj_dat.c head/crypto/openssl/crypto/objects/obj_dat.h head/crypto/openssl/crypto/objects/obj_dat.pl head/crypto/openssl/crypto/objects/obj_err.c head/crypto/openssl/crypto/objects/obj_lib.c head/crypto/openssl/crypto/objects/obj_mac.num head/crypto/openssl/crypto/objects/obj_xref.c head/crypto/openssl/crypto/objects/obj_xref.h head/crypto/openssl/crypto/objects/obj_xref.txt head/crypto/openssl/crypto/objects/objects.pl head/crypto/openssl/crypto/objects/objects.txt head/crypto/openssl/crypto/objects/objxref.pl head/crypto/openssl/crypto/ocsp/ocsp_asn.c head/crypto/openssl/crypto/ocsp/ocsp_cl.c head/crypto/openssl/crypto/ocsp/ocsp_err.c head/crypto/openssl/crypto/ocsp/ocsp_ext.c head/crypto/openssl/crypto/ocsp/ocsp_ht.c head/crypto/openssl/crypto/ocsp/ocsp_lib.c head/crypto/openssl/crypto/ocsp/ocsp_prn.c head/crypto/openssl/crypto/ocsp/ocsp_srv.c head/crypto/openssl/crypto/ocsp/ocsp_vfy.c head/crypto/openssl/crypto/pariscid.pl head/crypto/openssl/crypto/pem/pem_all.c head/crypto/openssl/crypto/pem/pem_err.c head/crypto/openssl/crypto/pem/pem_info.c head/crypto/openssl/crypto/pem/pem_lib.c head/crypto/openssl/crypto/pem/pem_oth.c head/crypto/openssl/crypto/pem/pem_pk8.c head/crypto/openssl/crypto/pem/pem_pkey.c head/crypto/openssl/crypto/pem/pem_sign.c head/crypto/openssl/crypto/pem/pem_x509.c head/crypto/openssl/crypto/pem/pem_xaux.c head/crypto/openssl/crypto/pem/pvkfmt.c head/crypto/openssl/crypto/perlasm/cbc.pl head/crypto/openssl/crypto/perlasm/ppc-xlate.pl head/crypto/openssl/crypto/perlasm/sparcv9_modes.pl head/crypto/openssl/crypto/perlasm/x86_64-xlate.pl head/crypto/openssl/crypto/perlasm/x86asm.pl head/crypto/openssl/crypto/perlasm/x86gas.pl head/crypto/openssl/crypto/perlasm/x86masm.pl head/crypto/openssl/crypto/perlasm/x86nasm.pl head/crypto/openssl/crypto/pkcs12/p12_add.c head/crypto/openssl/crypto/pkcs12/p12_asn.c head/crypto/openssl/crypto/pkcs12/p12_attr.c head/crypto/openssl/crypto/pkcs12/p12_crpt.c head/crypto/openssl/crypto/pkcs12/p12_crt.c head/crypto/openssl/crypto/pkcs12/p12_decr.c head/crypto/openssl/crypto/pkcs12/p12_init.c head/crypto/openssl/crypto/pkcs12/p12_key.c head/crypto/openssl/crypto/pkcs12/p12_kiss.c head/crypto/openssl/crypto/pkcs12/p12_mutl.c head/crypto/openssl/crypto/pkcs12/p12_npas.c head/crypto/openssl/crypto/pkcs12/p12_p8d.c head/crypto/openssl/crypto/pkcs12/p12_p8e.c head/crypto/openssl/crypto/pkcs12/p12_utl.c head/crypto/openssl/crypto/pkcs12/pk12err.c head/crypto/openssl/crypto/pkcs7/bio_pk7.c head/crypto/openssl/crypto/pkcs7/pk7_asn1.c head/crypto/openssl/crypto/pkcs7/pk7_attr.c head/crypto/openssl/crypto/pkcs7/pk7_doit.c head/crypto/openssl/crypto/pkcs7/pk7_lib.c head/crypto/openssl/crypto/pkcs7/pk7_mime.c head/crypto/openssl/crypto/pkcs7/pk7_smime.c head/crypto/openssl/crypto/pkcs7/pkcs7err.c head/crypto/openssl/crypto/ppc_arch.h head/crypto/openssl/crypto/ppccap.c head/crypto/openssl/crypto/ppccpuid.pl head/crypto/openssl/crypto/rand/rand_egd.c head/crypto/openssl/crypto/rand/rand_err.c head/crypto/openssl/crypto/rand/rand_lcl.h head/crypto/openssl/crypto/rand/rand_lib.c head/crypto/openssl/crypto/rand/rand_unix.c head/crypto/openssl/crypto/rand/randfile.c head/crypto/openssl/crypto/rc2/rc2_cbc.c head/crypto/openssl/crypto/rc2/rc2_ecb.c head/crypto/openssl/crypto/rc2/rc2_locl.h head/crypto/openssl/crypto/rc2/rc2_skey.c head/crypto/openssl/crypto/rc2/rc2cfb64.c head/crypto/openssl/crypto/rc2/rc2ofb64.c head/crypto/openssl/crypto/rc4/asm/rc4-586.pl head/crypto/openssl/crypto/rc4/asm/rc4-md5-x86_64.pl head/crypto/openssl/crypto/rc4/asm/rc4-parisc.pl head/crypto/openssl/crypto/rc4/asm/rc4-s390x.pl head/crypto/openssl/crypto/rc4/asm/rc4-x86_64.pl head/crypto/openssl/crypto/rc4/rc4_enc.c head/crypto/openssl/crypto/rc4/rc4_locl.h head/crypto/openssl/crypto/rc4/rc4_skey.c head/crypto/openssl/crypto/rc5/asm/rc5-586.pl head/crypto/openssl/crypto/rc5/rc5_ecb.c head/crypto/openssl/crypto/rc5/rc5_enc.c head/crypto/openssl/crypto/rc5/rc5_locl.h head/crypto/openssl/crypto/rc5/rc5_skey.c head/crypto/openssl/crypto/rc5/rc5cfb64.c head/crypto/openssl/crypto/rc5/rc5ofb64.c head/crypto/openssl/crypto/ripemd/asm/rmd-586.pl head/crypto/openssl/crypto/ripemd/rmd_dgst.c head/crypto/openssl/crypto/ripemd/rmd_locl.h head/crypto/openssl/crypto/ripemd/rmd_one.c head/crypto/openssl/crypto/ripemd/rmdconst.h head/crypto/openssl/crypto/rsa/rsa_ameth.c head/crypto/openssl/crypto/rsa/rsa_asn1.c head/crypto/openssl/crypto/rsa/rsa_chk.c head/crypto/openssl/crypto/rsa/rsa_crpt.c head/crypto/openssl/crypto/rsa/rsa_depr.c head/crypto/openssl/crypto/rsa/rsa_err.c head/crypto/openssl/crypto/rsa/rsa_gen.c head/crypto/openssl/crypto/rsa/rsa_lib.c head/crypto/openssl/crypto/rsa/rsa_locl.h head/crypto/openssl/crypto/rsa/rsa_none.c head/crypto/openssl/crypto/rsa/rsa_oaep.c head/crypto/openssl/crypto/rsa/rsa_pk1.c head/crypto/openssl/crypto/rsa/rsa_pmeth.c head/crypto/openssl/crypto/rsa/rsa_prn.c head/crypto/openssl/crypto/rsa/rsa_pss.c head/crypto/openssl/crypto/rsa/rsa_saos.c head/crypto/openssl/crypto/rsa/rsa_sign.c head/crypto/openssl/crypto/rsa/rsa_ssl.c head/crypto/openssl/crypto/rsa/rsa_x931.c head/crypto/openssl/crypto/s390xcap.c head/crypto/openssl/crypto/seed/seed.c head/crypto/openssl/crypto/seed/seed_cbc.c head/crypto/openssl/crypto/seed/seed_cfb.c head/crypto/openssl/crypto/seed/seed_ecb.c head/crypto/openssl/crypto/seed/seed_locl.h head/crypto/openssl/crypto/seed/seed_ofb.c head/crypto/openssl/crypto/sha/asm/sha1-586.pl head/crypto/openssl/crypto/sha/asm/sha1-armv4-large.pl head/crypto/openssl/crypto/sha/asm/sha1-armv8.pl head/crypto/openssl/crypto/sha/asm/sha1-ia64.pl head/crypto/openssl/crypto/sha/asm/sha1-mb-x86_64.pl head/crypto/openssl/crypto/sha/asm/sha1-mips.pl head/crypto/openssl/crypto/sha/asm/sha1-parisc.pl head/crypto/openssl/crypto/sha/asm/sha1-ppc.pl head/crypto/openssl/crypto/sha/asm/sha1-s390x.pl head/crypto/openssl/crypto/sha/asm/sha1-sparcv9.pl head/crypto/openssl/crypto/sha/asm/sha1-sparcv9a.pl head/crypto/openssl/crypto/sha/asm/sha1-thumb.pl head/crypto/openssl/crypto/sha/asm/sha1-x86_64.pl head/crypto/openssl/crypto/sha/asm/sha256-586.pl head/crypto/openssl/crypto/sha/asm/sha256-armv4.pl head/crypto/openssl/crypto/sha/asm/sha256-mb-x86_64.pl head/crypto/openssl/crypto/sha/asm/sha512-586.pl head/crypto/openssl/crypto/sha/asm/sha512-armv4.pl head/crypto/openssl/crypto/sha/asm/sha512-armv8.pl head/crypto/openssl/crypto/sha/asm/sha512-ia64.pl head/crypto/openssl/crypto/sha/asm/sha512-mips.pl head/crypto/openssl/crypto/sha/asm/sha512-parisc.pl head/crypto/openssl/crypto/sha/asm/sha512-ppc.pl head/crypto/openssl/crypto/sha/asm/sha512-s390x.pl head/crypto/openssl/crypto/sha/asm/sha512-sparcv9.pl head/crypto/openssl/crypto/sha/asm/sha512-x86_64.pl head/crypto/openssl/crypto/sha/asm/sha512p8-ppc.pl head/crypto/openssl/crypto/sha/sha1_one.c head/crypto/openssl/crypto/sha/sha1dgst.c head/crypto/openssl/crypto/sha/sha256.c head/crypto/openssl/crypto/sha/sha512.c head/crypto/openssl/crypto/sha/sha_locl.h head/crypto/openssl/crypto/sparc_arch.h head/crypto/openssl/crypto/sparccpuid.S head/crypto/openssl/crypto/sparcv9cap.c head/crypto/openssl/crypto/srp/srp_lib.c head/crypto/openssl/crypto/srp/srp_vfy.c head/crypto/openssl/crypto/stack/stack.c head/crypto/openssl/crypto/ts/ts_asn1.c head/crypto/openssl/crypto/ts/ts_conf.c head/crypto/openssl/crypto/ts/ts_err.c head/crypto/openssl/crypto/ts/ts_lib.c head/crypto/openssl/crypto/ts/ts_req_print.c head/crypto/openssl/crypto/ts/ts_req_utils.c head/crypto/openssl/crypto/ts/ts_rsp_print.c head/crypto/openssl/crypto/ts/ts_rsp_sign.c head/crypto/openssl/crypto/ts/ts_rsp_utils.c head/crypto/openssl/crypto/ts/ts_rsp_verify.c head/crypto/openssl/crypto/ts/ts_verify_ctx.c head/crypto/openssl/crypto/txt_db/txt_db.c head/crypto/openssl/crypto/ui/ui_err.c head/crypto/openssl/crypto/ui/ui_lib.c head/crypto/openssl/crypto/ui/ui_locl.h head/crypto/openssl/crypto/ui/ui_openssl.c head/crypto/openssl/crypto/ui/ui_util.c head/crypto/openssl/crypto/uid.c head/crypto/openssl/crypto/vms_rms.h head/crypto/openssl/crypto/whrlpool/asm/wp-mmx.pl head/crypto/openssl/crypto/whrlpool/asm/wp-x86_64.pl head/crypto/openssl/crypto/whrlpool/wp_block.c head/crypto/openssl/crypto/whrlpool/wp_dgst.c head/crypto/openssl/crypto/whrlpool/wp_locl.h head/crypto/openssl/crypto/x509/by_dir.c head/crypto/openssl/crypto/x509/by_file.c head/crypto/openssl/crypto/x509/x509_att.c head/crypto/openssl/crypto/x509/x509_cmp.c head/crypto/openssl/crypto/x509/x509_d2.c head/crypto/openssl/crypto/x509/x509_def.c head/crypto/openssl/crypto/x509/x509_err.c head/crypto/openssl/crypto/x509/x509_ext.c head/crypto/openssl/crypto/x509/x509_lu.c head/crypto/openssl/crypto/x509/x509_obj.c head/crypto/openssl/crypto/x509/x509_r2x.c head/crypto/openssl/crypto/x509/x509_req.c head/crypto/openssl/crypto/x509/x509_set.c head/crypto/openssl/crypto/x509/x509_trs.c head/crypto/openssl/crypto/x509/x509_txt.c head/crypto/openssl/crypto/x509/x509_v3.c head/crypto/openssl/crypto/x509/x509_vfy.c head/crypto/openssl/crypto/x509/x509_vpm.c head/crypto/openssl/crypto/x509/x509cset.c head/crypto/openssl/crypto/x509/x509name.c head/crypto/openssl/crypto/x509/x509rset.c head/crypto/openssl/crypto/x509/x509spki.c head/crypto/openssl/crypto/x509/x509type.c head/crypto/openssl/crypto/x509/x_all.c head/crypto/openssl/crypto/x509v3/ext_dat.h head/crypto/openssl/crypto/x509v3/pcy_cache.c head/crypto/openssl/crypto/x509v3/pcy_data.c head/crypto/openssl/crypto/x509v3/pcy_int.h head/crypto/openssl/crypto/x509v3/pcy_lib.c head/crypto/openssl/crypto/x509v3/pcy_map.c head/crypto/openssl/crypto/x509v3/pcy_node.c head/crypto/openssl/crypto/x509v3/pcy_tree.c head/crypto/openssl/crypto/x509v3/v3_addr.c head/crypto/openssl/crypto/x509v3/v3_akey.c head/crypto/openssl/crypto/x509v3/v3_akeya.c head/crypto/openssl/crypto/x509v3/v3_alt.c head/crypto/openssl/crypto/x509v3/v3_asid.c head/crypto/openssl/crypto/x509v3/v3_bcons.c head/crypto/openssl/crypto/x509v3/v3_bitst.c head/crypto/openssl/crypto/x509v3/v3_conf.c head/crypto/openssl/crypto/x509v3/v3_cpols.c head/crypto/openssl/crypto/x509v3/v3_crld.c head/crypto/openssl/crypto/x509v3/v3_enum.c head/crypto/openssl/crypto/x509v3/v3_extku.c head/crypto/openssl/crypto/x509v3/v3_genn.c head/crypto/openssl/crypto/x509v3/v3_ia5.c head/crypto/openssl/crypto/x509v3/v3_info.c head/crypto/openssl/crypto/x509v3/v3_int.c head/crypto/openssl/crypto/x509v3/v3_lib.c head/crypto/openssl/crypto/x509v3/v3_ncons.c head/crypto/openssl/crypto/x509v3/v3_pci.c head/crypto/openssl/crypto/x509v3/v3_pcia.c head/crypto/openssl/crypto/x509v3/v3_pcons.c head/crypto/openssl/crypto/x509v3/v3_pku.c head/crypto/openssl/crypto/x509v3/v3_pmaps.c head/crypto/openssl/crypto/x509v3/v3_prn.c head/crypto/openssl/crypto/x509v3/v3_purp.c head/crypto/openssl/crypto/x509v3/v3_skey.c head/crypto/openssl/crypto/x509v3/v3_sxnet.c head/crypto/openssl/crypto/x509v3/v3_utl.c head/crypto/openssl/crypto/x509v3/v3err.c head/crypto/openssl/crypto/x86_64cpuid.pl head/crypto/openssl/crypto/x86cpuid.pl head/crypto/openssl/doc/HOWTO/certificates.txt head/crypto/openssl/doc/HOWTO/keys.txt head/crypto/openssl/doc/HOWTO/proxy_certificates.txt head/crypto/openssl/doc/README head/crypto/openssl/doc/dir-locals.example.el head/crypto/openssl/doc/openssl-c-indent.el head/crypto/openssl/e_os.h head/crypto/openssl/engines/e_capi.c head/crypto/openssl/engines/e_capi_err.c head/crypto/openssl/engines/e_capi_err.h head/crypto/openssl/engines/e_padlock.c head/crypto/openssl/ssl/bio_ssl.c head/crypto/openssl/ssl/d1_lib.c head/crypto/openssl/ssl/d1_srtp.c head/crypto/openssl/ssl/s3_cbc.c head/crypto/openssl/ssl/s3_enc.c head/crypto/openssl/ssl/s3_lib.c head/crypto/openssl/ssl/ssl_asn1.c head/crypto/openssl/ssl/ssl_cert.c head/crypto/openssl/ssl/ssl_ciph.c head/crypto/openssl/ssl/ssl_conf.c head/crypto/openssl/ssl/ssl_err.c head/crypto/openssl/ssl/ssl_lib.c head/crypto/openssl/ssl/ssl_locl.h head/crypto/openssl/ssl/ssl_rsa.c head/crypto/openssl/ssl/ssl_sess.c head/crypto/openssl/ssl/ssl_stat.c head/crypto/openssl/ssl/ssl_txt.c head/crypto/openssl/ssl/ssl_utst.c head/crypto/openssl/ssl/t1_enc.c head/crypto/openssl/ssl/t1_lib.c head/crypto/openssl/ssl/t1_trce.c head/crypto/openssl/ssl/tls_srp.c head/kerberos5/Makefile.inc head/kerberos5/include/crypto-headers.h head/lib/libfetch/common.c head/lib/libmp/mpasbn.c head/lib/libradius/radlib.c head/sbin/decryptcore/decryptcore.c head/secure/lib/libcrypto/Makefile head/secure/lib/libcrypto/Makefile.asm head/secure/lib/libcrypto/Makefile.depend head/secure/lib/libcrypto/Makefile.inc head/secure/lib/libcrypto/Makefile.man head/secure/lib/libcrypto/aarch64/aesv8-armx.S head/secure/lib/libcrypto/aarch64/ghashv8-armx.S head/secure/lib/libcrypto/aarch64/sha1-armv8.S head/secure/lib/libcrypto/aarch64/sha256-armv8.S head/secure/lib/libcrypto/aarch64/sha512-armv8.S head/secure/lib/libcrypto/amd64/aes-x86_64.S head/secure/lib/libcrypto/amd64/aesni-gcm-x86_64.S head/secure/lib/libcrypto/amd64/aesni-mb-x86_64.S head/secure/lib/libcrypto/amd64/aesni-sha1-x86_64.S head/secure/lib/libcrypto/amd64/aesni-sha256-x86_64.S head/secure/lib/libcrypto/amd64/aesni-x86_64.S head/secure/lib/libcrypto/amd64/bsaes-x86_64.S head/secure/lib/libcrypto/amd64/cmll-x86_64.S head/secure/lib/libcrypto/amd64/ecp_nistz256-x86_64.S head/secure/lib/libcrypto/amd64/ghash-x86_64.S head/secure/lib/libcrypto/amd64/md5-x86_64.S head/secure/lib/libcrypto/amd64/rc4-md5-x86_64.S head/secure/lib/libcrypto/amd64/rc4-x86_64.S head/secure/lib/libcrypto/amd64/rsaz-avx2.S head/secure/lib/libcrypto/amd64/rsaz-x86_64.S head/secure/lib/libcrypto/amd64/sha1-mb-x86_64.S head/secure/lib/libcrypto/amd64/sha1-x86_64.S head/secure/lib/libcrypto/amd64/sha256-mb-x86_64.S head/secure/lib/libcrypto/amd64/sha256-x86_64.S head/secure/lib/libcrypto/amd64/sha512-x86_64.S head/secure/lib/libcrypto/amd64/wp-x86_64.S head/secure/lib/libcrypto/amd64/x86_64-gf2m.S head/secure/lib/libcrypto/amd64/x86_64-mont.S head/secure/lib/libcrypto/amd64/x86_64-mont5.S head/secure/lib/libcrypto/amd64/x86_64cpuid.S head/secure/lib/libcrypto/arm/aes-armv4.S head/secure/lib/libcrypto/arm/aesv8-armx.S head/secure/lib/libcrypto/arm/armv4-gf2m.S head/secure/lib/libcrypto/arm/armv4-mont.S head/secure/lib/libcrypto/arm/bsaes-armv7.S head/secure/lib/libcrypto/arm/ghash-armv4.S head/secure/lib/libcrypto/arm/ghashv8-armx.S head/secure/lib/libcrypto/arm/sha1-armv4-large.S head/secure/lib/libcrypto/arm/sha256-armv4.S head/secure/lib/libcrypto/arm/sha512-armv4.S head/secure/lib/libcrypto/engines/Makefile head/secure/lib/libcrypto/engines/Makefile.inc head/secure/lib/libcrypto/i386/aes-586.S head/secure/lib/libcrypto/i386/aesni-x86.S head/secure/lib/libcrypto/i386/bf-586.S head/secure/lib/libcrypto/i386/bn-586.S head/secure/lib/libcrypto/i386/cmll-x86.S head/secure/lib/libcrypto/i386/co-586.S head/secure/lib/libcrypto/i386/crypt586.S head/secure/lib/libcrypto/i386/des-586.S head/secure/lib/libcrypto/i386/ghash-x86.S head/secure/lib/libcrypto/i386/md5-586.S head/secure/lib/libcrypto/i386/rc4-586.S head/secure/lib/libcrypto/i386/rc5-586.S head/secure/lib/libcrypto/i386/rmd-586.S head/secure/lib/libcrypto/i386/sha1-586.S head/secure/lib/libcrypto/i386/sha256-586.S head/secure/lib/libcrypto/i386/sha512-586.S head/secure/lib/libcrypto/i386/vpaes-x86.S head/secure/lib/libcrypto/i386/wp-mmx.S head/secure/lib/libcrypto/i386/x86-gf2m.S head/secure/lib/libcrypto/i386/x86-mont.S head/secure/lib/libcrypto/i386/x86cpuid.S head/secure/lib/libcrypto/man/ASN1_OBJECT_new.3 head/secure/lib/libcrypto/man/ASN1_STRING_length.3 head/secure/lib/libcrypto/man/ASN1_STRING_new.3 head/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3 head/secure/lib/libcrypto/man/ASN1_TIME_set.3 head/secure/lib/libcrypto/man/ASN1_generate_nconf.3 head/secure/lib/libcrypto/man/BIO_ctrl.3 head/secure/lib/libcrypto/man/BIO_f_base64.3 head/secure/lib/libcrypto/man/BIO_f_buffer.3 head/secure/lib/libcrypto/man/BIO_f_cipher.3 head/secure/lib/libcrypto/man/BIO_f_md.3 head/secure/lib/libcrypto/man/BIO_f_null.3 head/secure/lib/libcrypto/man/BIO_f_ssl.3 head/secure/lib/libcrypto/man/BIO_find_type.3 head/secure/lib/libcrypto/man/BIO_new.3 head/secure/lib/libcrypto/man/BIO_new_CMS.3 head/secure/lib/libcrypto/man/BIO_push.3 head/secure/lib/libcrypto/man/BIO_read.3 head/secure/lib/libcrypto/man/BIO_s_accept.3 head/secure/lib/libcrypto/man/BIO_s_bio.3 head/secure/lib/libcrypto/man/BIO_s_connect.3 head/secure/lib/libcrypto/man/BIO_s_fd.3 head/secure/lib/libcrypto/man/BIO_s_file.3 head/secure/lib/libcrypto/man/BIO_s_mem.3 head/secure/lib/libcrypto/man/BIO_s_null.3 head/secure/lib/libcrypto/man/BIO_s_socket.3 head/secure/lib/libcrypto/man/BIO_set_callback.3 head/secure/lib/libcrypto/man/BIO_should_retry.3 head/secure/lib/libcrypto/man/BN_BLINDING_new.3 head/secure/lib/libcrypto/man/BN_CTX_new.3 head/secure/lib/libcrypto/man/BN_CTX_start.3 head/secure/lib/libcrypto/man/BN_add.3 head/secure/lib/libcrypto/man/BN_add_word.3 head/secure/lib/libcrypto/man/BN_bn2bin.3 head/secure/lib/libcrypto/man/BN_cmp.3 head/secure/lib/libcrypto/man/BN_copy.3 head/secure/lib/libcrypto/man/BN_generate_prime.3 head/secure/lib/libcrypto/man/BN_mod_inverse.3 head/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3 head/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3 head/secure/lib/libcrypto/man/BN_new.3 head/secure/lib/libcrypto/man/BN_num_bytes.3 head/secure/lib/libcrypto/man/BN_rand.3 head/secure/lib/libcrypto/man/BN_set_bit.3 head/secure/lib/libcrypto/man/BN_swap.3 head/secure/lib/libcrypto/man/BN_zero.3 head/secure/lib/libcrypto/man/CMS_add0_cert.3 head/secure/lib/libcrypto/man/CMS_add1_recipient_cert.3 head/secure/lib/libcrypto/man/CMS_add1_signer.3 head/secure/lib/libcrypto/man/CMS_compress.3 head/secure/lib/libcrypto/man/CMS_decrypt.3 head/secure/lib/libcrypto/man/CMS_encrypt.3 head/secure/lib/libcrypto/man/CMS_final.3 head/secure/lib/libcrypto/man/CMS_get0_RecipientInfos.3 head/secure/lib/libcrypto/man/CMS_get0_SignerInfos.3 head/secure/lib/libcrypto/man/CMS_get0_type.3 head/secure/lib/libcrypto/man/CMS_get1_ReceiptRequest.3 head/secure/lib/libcrypto/man/CMS_sign.3 head/secure/lib/libcrypto/man/CMS_sign_receipt.3 head/secure/lib/libcrypto/man/CMS_uncompress.3 head/secure/lib/libcrypto/man/CMS_verify.3 head/secure/lib/libcrypto/man/CMS_verify_receipt.3 head/secure/lib/libcrypto/man/CONF_modules_free.3 head/secure/lib/libcrypto/man/CONF_modules_load_file.3 head/secure/lib/libcrypto/man/DH_generate_key.3 head/secure/lib/libcrypto/man/DH_generate_parameters.3 head/secure/lib/libcrypto/man/DH_new.3 head/secure/lib/libcrypto/man/DH_set_method.3 head/secure/lib/libcrypto/man/DH_size.3 head/secure/lib/libcrypto/man/DSA_SIG_new.3 head/secure/lib/libcrypto/man/DSA_do_sign.3 head/secure/lib/libcrypto/man/DSA_dup_DH.3 head/secure/lib/libcrypto/man/DSA_generate_key.3 head/secure/lib/libcrypto/man/DSA_generate_parameters.3 head/secure/lib/libcrypto/man/DSA_new.3 head/secure/lib/libcrypto/man/DSA_set_method.3 head/secure/lib/libcrypto/man/DSA_sign.3 head/secure/lib/libcrypto/man/DSA_size.3 head/secure/lib/libcrypto/man/EC_GFp_simple_method.3 head/secure/lib/libcrypto/man/EC_GROUP_copy.3 head/secure/lib/libcrypto/man/EC_GROUP_new.3 head/secure/lib/libcrypto/man/EC_KEY_new.3 head/secure/lib/libcrypto/man/EC_POINT_add.3 head/secure/lib/libcrypto/man/EC_POINT_new.3 head/secure/lib/libcrypto/man/ERR_GET_LIB.3 head/secure/lib/libcrypto/man/ERR_clear_error.3 head/secure/lib/libcrypto/man/ERR_error_string.3 head/secure/lib/libcrypto/man/ERR_get_error.3 head/secure/lib/libcrypto/man/ERR_load_crypto_strings.3 head/secure/lib/libcrypto/man/ERR_load_strings.3 head/secure/lib/libcrypto/man/ERR_print_errors.3 head/secure/lib/libcrypto/man/ERR_put_error.3 head/secure/lib/libcrypto/man/ERR_remove_state.3 head/secure/lib/libcrypto/man/ERR_set_mark.3 head/secure/lib/libcrypto/man/EVP_BytesToKey.3 head/secure/lib/libcrypto/man/EVP_DigestInit.3 head/secure/lib/libcrypto/man/EVP_DigestSignInit.3 head/secure/lib/libcrypto/man/EVP_DigestVerifyInit.3 head/secure/lib/libcrypto/man/EVP_EncodeInit.3 head/secure/lib/libcrypto/man/EVP_EncryptInit.3 head/secure/lib/libcrypto/man/EVP_OpenInit.3 head/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3 head/secure/lib/libcrypto/man/EVP_PKEY_CTX_new.3 head/secure/lib/libcrypto/man/EVP_PKEY_cmp.3 head/secure/lib/libcrypto/man/EVP_PKEY_decrypt.3 head/secure/lib/libcrypto/man/EVP_PKEY_derive.3 head/secure/lib/libcrypto/man/EVP_PKEY_encrypt.3 head/secure/lib/libcrypto/man/EVP_PKEY_keygen.3 head/secure/lib/libcrypto/man/EVP_PKEY_meth_new.3 (contents, props changed) head/secure/lib/libcrypto/man/EVP_PKEY_new.3 head/secure/lib/libcrypto/man/EVP_PKEY_print_private.3 head/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 head/secure/lib/libcrypto/man/EVP_PKEY_sign.3 head/secure/lib/libcrypto/man/EVP_PKEY_verify.3 head/secure/lib/libcrypto/man/EVP_PKEY_verify_recover.3 head/secure/lib/libcrypto/man/EVP_SealInit.3 head/secure/lib/libcrypto/man/EVP_SignInit.3 head/secure/lib/libcrypto/man/EVP_VerifyInit.3 head/secure/lib/libcrypto/man/OBJ_nid2obj.3 head/secure/lib/libcrypto/man/OPENSSL_Applink.3 head/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 head/secure/lib/libcrypto/man/OPENSSL_config.3 head/secure/lib/libcrypto/man/OPENSSL_ia32cap.3 head/secure/lib/libcrypto/man/OPENSSL_instrument_bus.3 head/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 head/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 head/secure/lib/libcrypto/man/PEM_write_bio_CMS_stream.3 head/secure/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3 head/secure/lib/libcrypto/man/PKCS12_create.3 head/secure/lib/libcrypto/man/PKCS12_parse.3 head/secure/lib/libcrypto/man/PKCS7_decrypt.3 head/secure/lib/libcrypto/man/PKCS7_encrypt.3 head/secure/lib/libcrypto/man/PKCS7_sign.3 head/secure/lib/libcrypto/man/PKCS7_sign_add_signer.3 head/secure/lib/libcrypto/man/PKCS7_verify.3 head/secure/lib/libcrypto/man/RAND_add.3 head/secure/lib/libcrypto/man/RAND_bytes.3 head/secure/lib/libcrypto/man/RAND_cleanup.3 head/secure/lib/libcrypto/man/RAND_egd.3 head/secure/lib/libcrypto/man/RAND_load_file.3 head/secure/lib/libcrypto/man/RAND_set_rand_method.3 head/secure/lib/libcrypto/man/RSA_blinding_on.3 head/secure/lib/libcrypto/man/RSA_check_key.3 head/secure/lib/libcrypto/man/RSA_generate_key.3 head/secure/lib/libcrypto/man/RSA_new.3 head/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 head/secure/lib/libcrypto/man/RSA_print.3 head/secure/lib/libcrypto/man/RSA_private_encrypt.3 head/secure/lib/libcrypto/man/RSA_public_encrypt.3 head/secure/lib/libcrypto/man/RSA_set_method.3 head/secure/lib/libcrypto/man/RSA_sign.3 head/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 head/secure/lib/libcrypto/man/RSA_size.3 head/secure/lib/libcrypto/man/SMIME_read_CMS.3 head/secure/lib/libcrypto/man/SMIME_read_PKCS7.3 head/secure/lib/libcrypto/man/SMIME_write_CMS.3 head/secure/lib/libcrypto/man/SMIME_write_PKCS7.3 head/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 head/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 head/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 head/secure/lib/libcrypto/man/X509_NAME_print_ex.3 head/secure/lib/libcrypto/man/X509_STORE_CTX_get_error.3 head/secure/lib/libcrypto/man/X509_STORE_CTX_new.3 head/secure/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3 head/secure/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3 head/secure/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3 head/secure/lib/libcrypto/man/X509_check_host.3 head/secure/lib/libcrypto/man/X509_check_private_key.3 (contents, props changed) head/secure/lib/libcrypto/man/X509_cmp_time.3 (contents, props changed) head/secure/lib/libcrypto/man/X509_new.3 head/secure/lib/libcrypto/man/X509_verify_cert.3 head/secure/lib/libcrypto/man/d2i_DHparams.3 head/secure/lib/libcrypto/man/d2i_PrivateKey.3 head/secure/lib/libcrypto/man/d2i_X509.3 head/secure/lib/libcrypto/man/i2d_CMS_bio_stream.3 head/secure/lib/libcrypto/man/i2d_PKCS7_bio_stream.3 head/secure/lib/libssl/Makefile head/secure/lib/libssl/Makefile.depend head/secure/usr.bin/openssl/Makefile head/secure/usr.bin/openssl/Makefile.man head/secure/usr.bin/openssl/man/CA.pl.1 head/secure/usr.bin/openssl/man/asn1parse.1 head/secure/usr.bin/openssl/man/ca.1 head/secure/usr.bin/openssl/man/ciphers.1 head/secure/usr.bin/openssl/man/cms.1 head/secure/usr.bin/openssl/man/crl.1 head/secure/usr.bin/openssl/man/crl2pkcs7.1 head/secure/usr.bin/openssl/man/dgst.1 head/secure/usr.bin/openssl/man/dhparam.1 head/secure/usr.bin/openssl/man/dsa.1 head/secure/usr.bin/openssl/man/dsaparam.1 head/secure/usr.bin/openssl/man/ec.1 head/secure/usr.bin/openssl/man/ecparam.1 head/secure/usr.bin/openssl/man/enc.1 head/secure/usr.bin/openssl/man/errstr.1 head/secure/usr.bin/openssl/man/gendsa.1 head/secure/usr.bin/openssl/man/genpkey.1 head/secure/usr.bin/openssl/man/genrsa.1 head/secure/usr.bin/openssl/man/nseq.1 head/secure/usr.bin/openssl/man/ocsp.1 head/secure/usr.bin/openssl/man/openssl.1 head/secure/usr.bin/openssl/man/passwd.1 head/secure/usr.bin/openssl/man/pkcs12.1 head/secure/usr.bin/openssl/man/pkcs7.1 head/secure/usr.bin/openssl/man/pkcs8.1 head/secure/usr.bin/openssl/man/pkey.1 head/secure/usr.bin/openssl/man/pkeyparam.1 head/secure/usr.bin/openssl/man/pkeyutl.1 head/secure/usr.bin/openssl/man/rand.1 head/secure/usr.bin/openssl/man/req.1 head/secure/usr.bin/openssl/man/rsa.1 head/secure/usr.bin/openssl/man/rsautl.1 head/secure/usr.bin/openssl/man/s_client.1 head/secure/usr.bin/openssl/man/s_server.1 head/secure/usr.bin/openssl/man/s_time.1 head/secure/usr.bin/openssl/man/sess_id.1 head/secure/usr.bin/openssl/man/smime.1 head/secure/usr.bin/openssl/man/speed.1 head/secure/usr.bin/openssl/man/spkac.1 head/secure/usr.bin/openssl/man/ts.1 head/secure/usr.bin/openssl/man/tsget.1 head/secure/usr.bin/openssl/man/verify.1 head/secure/usr.bin/openssl/man/version.1 head/secure/usr.bin/openssl/man/x509.1 head/share/mk/src.libnames.mk head/sys/geom/eli/g_eli_crypto.c head/sys/sys/param.h head/usr.bin/dc/bcode.c head/usr.bin/dc/inout.c head/usr.bin/factor/factor.c head/usr.sbin/ppp/chap_ms.c head/usr.sbin/uefisign/uefisign.c Directory Properties: head/crypto/openssl/ (props changed) Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Tue Oct 9 20:42:17 2018 (r339269) +++ head/ObsoleteFiles.inc Tue Oct 9 21:28:26 2018 (r339270) @@ -38,6 +38,229 @@ # xargs -n1 | sort | uniq -d; # done +# 20181009: OpenSSL 1.1.1 +OLD_FILES+=usr/include/openssl/des_old.h +OLD_FILES+=usr/include/openssl/dso.h +OLD_FILES+=usr/include/openssl/krb5_asn.h +OLD_FILES+=usr/include/openssl/kssl.h +OLD_FILES+=usr/include/openssl/pqueue.h +OLD_FILES+=usr/include/openssl/ssl23.h +OLD_FILES+=usr/include/openssl/ui_compat.h +OLD_FILES+=usr/share/openssl/man/man1/dss1.1.gz +OLD_FILES+=usr/share/openssl/man/man1/md2.1.gz +OLD_FILES+=usr/share/openssl/man/man1/md4.1.gz +OLD_FILES+=usr/share/openssl/man/man1/md5.1.gz +OLD_FILES+=usr/share/openssl/man/man1/mdc2.1.gz +OLD_FILES+=usr/share/openssl/man/man1/ripemd160.1.gz +OLD_FILES+=usr/share/openssl/man/man1/sha.1.gz +OLD_FILES+=usr/share/openssl/man/man1/sha1.1.gz +OLD_FILES+=usr/share/openssl/man/man1/sha224.1.gz +OLD_FILES+=usr/share/openssl/man/man1/sha256.1.gz +OLD_FILES+=usr/share/openssl/man/man1/sha384.1.gz +OLD_FILES+=usr/share/openssl/man/man1/sha512.1.gz +OLD_FILES+=usr/share/openssl/man/man1/x509v3_config.1.gz +OLD_FILES+=usr/share/openssl/man/man3/ASN1_STRING_length_set.3.gz +OLD_FILES+=usr/share/openssl/man/man3/BIO_get_conn_int_port.3.gz +OLD_FILES+=usr/share/openssl/man/man3/BIO_get_conn_ip.3.gz +OLD_FILES+=usr/share/openssl/man/man3/BIO_set.3.gz +OLD_FILES+=usr/share/openssl/man/man3/BIO_set_conn_int_port.3.gz +OLD_FILES+=usr/share/openssl/man/man3/BIO_set_conn_ip.3.gz +OLD_FILES+=usr/share/openssl/man/man3/BN_BLINDING_get_thread_id.3.gz +OLD_FILES+=usr/share/openssl/man/man3/BN_BLINDING_set_thread_id.3.gz +OLD_FILES+=usr/share/openssl/man/man3/BN_BLINDING_thread_id.3.gz +OLD_FILES+=usr/share/openssl/man/man3/BN_CTX_init.3.gz +OLD_FILES+=usr/share/openssl/man/man3/BN_MONT_CTX_init.3.gz +OLD_FILES+=usr/share/openssl/man/man3/BN_RECP_CTX_init.3.gz +OLD_FILES+=usr/share/openssl/man/man3/BN_init.3.gz +OLD_FILES+=usr/share/openssl/man/man3/BUF_memdup.3.gz +OLD_FILES+=usr/share/openssl/man/man3/BUF_memdup.3.gz +OLD_FILES+=usr/share/openssl/man/man3/BUF_strdup.3.gz +OLD_FILES+=usr/share/openssl/man/man3/BUF_strlcat.3.gz +OLD_FILES+=usr/share/openssl/man/man3/BUF_strlcpy.3.gz +OLD_FILES+=usr/share/openssl/man/man3/BUF_strndup.3.gz +OLD_FILES+=usr/share/openssl/man/man3/CMS_set1_signer_cert.3.gz +OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_cmp.3.gz +OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_cpy.3.gz +OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_current.3.gz +OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_get_callback.3.gz +OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_hash.3.gz +OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_set_callback.3.gz +OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_destroy_dynlockid.3.gz +OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_get_new_dynlockid.3.gz +OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_lock.3.gz +OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_num_locks.3.gz +OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_dynlock_create_callback.3.gz +OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_dynlock_destroy_callback.3.gz +OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_dynlock_lock_callback.3.gz +OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_locking_callback.3.gz +OLD_FILES+=usr/share/openssl/man/man3/DES_ede3_cbcm_encrypt.3.gz +OLD_FILES+=usr/share/openssl/man/man3/DES_enc_read.3.gz +OLD_FILES+=usr/share/openssl/man/man3/DES_enc_write.3.gz +OLD_FILES+=usr/share/openssl/man/man3/EC_KEY_get_key_method_data.3.gz +OLD_FILES+=usr/share/openssl/man/man3/EC_KEY_insert_key_method_data.3.gz +OLD_FILES+=usr/share/openssl/man/man3/EC_POINT_set_Jprojective_coordinates.3.gz +OLD_FILES+=usr/share/openssl/man/man3/ERR_load_UI_strings.3.gz +OLD_FILES+=usr/share/openssl/man/man3/EVP_CIPHER_CTX_cleanup.3.gz +OLD_FILES+=usr/share/openssl/man/man3/EVP_CIPHER_CTX_init.3.gz +OLD_FILES+=usr/share/openssl/man/man3/EVP_MAX_MD_SIZE.3.gz +OLD_FILES+=usr/share/openssl/man/man3/EVP_MD_CTX_cleanup.3.gz +OLD_FILES+=usr/share/openssl/man/man3/EVP_MD_CTX_create.3.gz +OLD_FILES+=usr/share/openssl/man/man3/EVP_MD_CTX_destroy.3.gz +OLD_FILES+=usr/share/openssl/man/man3/EVP_MD_CTX_init.3.gz +OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEVP_PKEY_CTX_set_app_data.3.gz +OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_CTX_set_rsa_rsa_keygen_bits.3.gz +OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_get_default_digest.3.gz +OLD_FILES+=usr/share/openssl/man/man3/EVP_dss.3.gz +OLD_FILES+=usr/share/openssl/man/man3/EVP_dss1.3.gz +OLD_FILES+=usr/share/openssl/man/man3/EVP_sha.3.gz +OLD_FILES+=usr/share/openssl/man/man3/HMAC_CTX_cleanup.3.gz +OLD_FILES+=usr/share/openssl/man/man3/HMAC_CTX_init.3.gz +OLD_FILES+=usr/share/openssl/man/man3/HMAC_cleanup.3.gz +OLD_FILES+=usr/share/openssl/man/man3/OPENSSL_ia32cap_loc.3.gz +OLD_FILES+=usr/share/openssl/man/man3/PEM.3.gz +OLD_FILES+=usr/share/openssl/man/man3/RAND_SSLeay.3.gz +OLD_FILES+=usr/share/openssl/man/man3/RSA_PKCS1_SSLeay.3.gz +OLD_FILES+=usr/share/openssl/man/man3/RSA_null_method.3.gz +OLD_FILES+=usr/share/openssl/man/man3/SSL.3.gz +OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_get_ex_new_index.3.gz +OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_need_tmp_rsa.3.gz +OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_set_custom_cli_ext.3.gz +OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_set_default_read_ahead.3.gz +OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_set_ecdh_auto.3.gz +OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_set_tmp_rsa.3.gz +OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_set_tmp_rsa_callback.3.gz +OLD_FILES+=usr/share/openssl/man/man3/SSL_SESSION_get_ex_new_index.3.gz +OLD_FILES+=usr/share/openssl/man/man3/SSL_add_session.3.gz +OLD_FILES+=usr/share/openssl/man/man3/SSL_flush_sessions.3.gz +OLD_FILES+=usr/share/openssl/man/man3/SSL_get_accept_state.3.gz +OLD_FILES+=usr/share/openssl/man/man3/SSL_get_ex_new_index.3.gz +OLD_FILES+=usr/share/openssl/man/man3/SSL_get_msg_callback_arg.3.gz +OLD_FILES+=usr/share/openssl/man/man3/SSL_need_tmp_rsa.3.gz +OLD_FILES+=usr/share/openssl/man/man3/SSL_remove_session.3.gz +OLD_FILES+=usr/share/openssl/man/man3/SSL_set_ecdh_auto.3.gz +OLD_FILES+=usr/share/openssl/man/man3/SSL_set_tmp_rsa.3.gz +OLD_FILES+=usr/share/openssl/man/man3/SSL_set_tmp_rsa_callback.3.gz +OLD_FILES+=usr/share/openssl/man/man3/SSLeay.3.gz +OLD_FILES+=usr/share/openssl/man/man3/SSLeay_add_ssl_algorithms.3.gz +OLD_FILES+=usr/share/openssl/man/man3/SSLeay_version.3.gz +OLD_FILES+=usr/share/openssl/man/man3/SSLv2_client_method.3.gz +OLD_FILES+=usr/share/openssl/man/man3/SSLv2_method.3.gz +OLD_FILES+=usr/share/openssl/man/man3/SSLv2_server_method.3.gz +OLD_FILES+=usr/share/openssl/man/man3/X509_STORE_CTX_set_chain.3.gz +OLD_FILES+=usr/share/openssl/man/man3/X509_STORE_CTX_trusted_stack.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bio.3.gz +OLD_FILES+=usr/share/openssl/man/man3/blowfish.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_add_words.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_check_top.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_cmp_words.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_div_words.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_dump.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_expand.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_expand2.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_fix_top.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_internal.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_mul_add_words.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_mul_comba4.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_mul_comba8.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_mul_high.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_mul_low_normal.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_mul_low_recursive.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_mul_normal.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_mul_part_recursive.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_mul_recursive.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_mul_words.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_print.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_set_high.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_set_low.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_set_max.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_sqr_comba4.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_sqr_comba8.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_sqr_normal.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_sqr_recursive.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_sqr_words.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_sub_words.3.gz +OLD_FILES+=usr/share/openssl/man/man3/bn_wexpand.3.gz +OLD_FILES+=usr/share/openssl/man/man3/buffer.3.gz +OLD_FILES+=usr/share/openssl/man/man3/crypto.3.gz +OLD_FILES+=usr/share/openssl/man/man3/d2i_ECPKParameters_bio.3.gz +OLD_FILES+=usr/share/openssl/man/man3/d2i_ECPKParameters_fp.3.gz +OLD_FILES+=usr/share/openssl/man/man3/d2i_ECPrivate_key.3.gz +OLD_FILES+=usr/share/openssl/man/man3/d2i_Netscape_RSA.3.gz +OLD_FILES+=usr/share/openssl/man/man3/d2i_PKCS8PrivateKey.3.gz +OLD_FILES+=usr/share/openssl/man/man3/d2i_Private_key.3.gz +OLD_FILES+=usr/share/openssl/man/man3/d2i_X509_bio.3.gz +OLD_FILES+=usr/share/openssl/man/man3/d2i_X509_fp.3.gz +OLD_FILES+=usr/share/openssl/man/man3/des.3.gz +OLD_FILES+=usr/share/openssl/man/man3/des_read_2passwords.3.gz +OLD_FILES+=usr/share/openssl/man/man3/des_read_password.3.gz +OLD_FILES+=usr/share/openssl/man/man3/des_read_pw.3.gz +OLD_FILES+=usr/share/openssl/man/man3/des_read_pw_string.3.gz +OLD_FILES+=usr/share/openssl/man/man3/dh.3.gz +OLD_FILES+=usr/share/openssl/man/man3/dsa.3.gz +OLD_FILES+=usr/share/openssl/man/man3/ec.3.gz +OLD_FILES+=usr/share/openssl/man/man3/ecdsa.3.gz +OLD_FILES+=usr/share/openssl/man/man3/engine.3.gz +OLD_FILES+=usr/share/openssl/man/man3/err.3.gz +OLD_FILES+=usr/share/openssl/man/man3/evp.3.gz +OLD_FILES+=usr/share/openssl/man/man3/hmac.3.gz +OLD_FILES+=usr/share/openssl/man/man3/i2d_ECPKParameters_bio.3.gz +OLD_FILES+=usr/share/openssl/man/man3/i2d_ECPKParameters_fp.3.gz +OLD_FILES+=usr/share/openssl/man/man3/i2d_Netscape_RSA.3.gz +OLD_FILES+=usr/share/openssl/man/man3/i2d_X509_bio.3.gz +OLD_FILES+=usr/share/openssl/man/man3/i2d_X509_fp.3.gz +OLD_FILES+=usr/share/openssl/man/man3/lh_delete.3.gz +OLD_FILES+=usr/share/openssl/man/man3/lh_doall.3.gz +OLD_FILES+=usr/share/openssl/man/man3/lh_doall_arg.3.gz +OLD_FILES+=usr/share/openssl/man/man3/lh_error.3.gz +OLD_FILES+=usr/share/openssl/man/man3/lh_free.3.gz +OLD_FILES+=usr/share/openssl/man/man3/lh_insert.3.gz +OLD_FILES+=usr/share/openssl/man/man3/lh_new.3.gz +OLD_FILES+=usr/share/openssl/man/man3/lh_node_stats.3.gz +OLD_FILES+=usr/share/openssl/man/man3/lh_node_stats_bio.3.gz +OLD_FILES+=usr/share/openssl/man/man3/lh_node_usage_stats.3.gz +OLD_FILES+=usr/share/openssl/man/man3/lh_node_usage_stats_bio.3.gz +OLD_FILES+=usr/share/openssl/man/man3/lh_retrieve.3.gz +OLD_FILES+=usr/share/openssl/man/man3/lh_stats.3.gz +OLD_FILES+=usr/share/openssl/man/man3/lh_stats_bio.3.gz +OLD_FILES+=usr/share/openssl/man/man3/lhash.3.gz +OLD_FILES+=usr/share/openssl/man/man3/md5.3.gz +OLD_FILES+=usr/share/openssl/man/man3/mdc2.3.gz +OLD_FILES+=usr/share/openssl/man/man3/pem.3.gz +OLD_FILES+=usr/share/openssl/man/man3/rand.3.gz +OLD_FILES+=usr/share/openssl/man/man3/rc4.3.gz +OLD_FILES+=usr/share/openssl/man/man3/ripemd.3.gz +OLD_FILES+=usr/share/openssl/man/man3/rsa.3.gz +OLD_FILES+=usr/share/openssl/man/man3/sha.3.gz +OLD_FILES+=usr/share/openssl/man/man3/ssl.3.gz +OLD_FILES+=usr/share/openssl/man/man3/threads.3.gz +OLD_FILES+=usr/share/openssl/man/man3/ui.3.gz +OLD_FILES+=usr/share/openssl/man/man3/ui_compat.3.gz +OLD_FILES+=usr/share/openssl/man/man3/x509.3.gz +OLD_LIBS+=lib/libcrypto.so.8 +OLD_LIBS+=usr/lib/engines/lib4758cca.so +OLD_LIBS+=usr/lib/engines/libaep.so +OLD_LIBS+=usr/lib/engines/libatalla.so +OLD_LIBS+=usr/lib/engines/libcapi.so +OLD_LIBS+=usr/lib/engines/libchil.so +OLD_LIBS+=usr/lib/engines/libcswift.so +OLD_LIBS+=usr/lib/engines/libgost.so +OLD_LIBS+=usr/lib/engines/libnuron.so +OLD_LIBS+=usr/lib/engines/libsureware.so +OLD_LIBS+=usr/lib/engines/libubsec.so +OLD_LIBS+=usr/lib/libssl.so.8 +OLD_LIBS+=usr/lib32/libcrypto.so.8 +OLD_LIBS+=usr/lib32/lib4758cca.so +OLD_LIBS+=usr/lib32/libaep.so +OLD_LIBS+=usr/lib32/libatalla.so +OLD_LIBS+=usr/lib32/libcapi.so +OLD_LIBS+=usr/lib32/libchil.so +OLD_LIBS+=usr/lib32/libcswift.so +OLD_LIBS+=usr/lib32/libgost.so +OLD_LIBS+=usr/lib32/libnuron.so +OLD_LIBS+=usr/lib32/libsureware.so +OLD_LIBS+=usr/lib32/libubsec.so +OLD_LIBS+=usr/lib32/libssl.so.8 # 20180824: libbe(3) SHLIBDIR fixed to reflect correct location OLD_LIBS+=usr/lib/libbe.so.1 # 20180819: Remove deprecated arc4random(3) stir/addrandom interfaces Modified: head/UPDATING ============================================================================== --- head/UPDATING Tue Oct 9 20:42:17 2018 (r339269) +++ head/UPDATING Tue Oct 9 21:28:26 2018 (r339270) @@ -31,6 +31,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20181009: + OpenSSL has been updated to version 1.1.1. This update included + additional various API changes througout the base system. It is + important to rebuild third-party software after upgrading. The value + of __FreeBSD_version has been bumped accordingly. + 20181006: The legacy DRM modules and drivers have now been added to the loader's module blacklist, in favor of loading them with kld_list in rc.conf(5). Modified: head/contrib/bsnmp/lib/snmpcrypto.c ============================================================================== --- head/contrib/bsnmp/lib/snmpcrypto.c Tue Oct 9 20:42:17 2018 (r339269) +++ head/contrib/bsnmp/lib/snmpcrypto.c Tue Oct 9 21:28:26 2018 (r339270) @@ -94,9 +94,14 @@ snmp_pdu_calc_digest(const struct snmp_pdu *pdu, uint8 uint32_t i, keylen, olen; int32_t err; const EVP_MD *dtype; - EVP_MD_CTX ctx; + EVP_MD_CTX *ctx; - err = snmp_digest_init(&pdu->user, &ctx, &dtype, &keylen); + ctx = EVP_MD_CTX_new(); + if (ctx == NULL) + return (SNMP_CODE_FAILED); + err = snmp_digest_init(&pdu->user, ctx, &dtype, &keylen); + if (err <= 0) + EVP_MD_CTX_free(ctx); if (err < 0) return (SNMP_CODE_BADDIGEST); else if (err == 0) @@ -111,29 +116,29 @@ snmp_pdu_calc_digest(const struct snmp_pdu *pdu, uint8 key2[i] = extkey[i] ^ opad; } - if (EVP_DigestUpdate(&ctx, key1, SNMP_EXTENDED_KEY_SIZ) != 1 || - EVP_DigestUpdate(&ctx, pdu->outer_ptr, pdu->outer_len) != 1 || - EVP_DigestFinal(&ctx, md, &olen) != 1) + if (EVP_DigestUpdate(ctx, key1, SNMP_EXTENDED_KEY_SIZ) != 1 || + EVP_DigestUpdate(ctx, pdu->outer_ptr, pdu->outer_len) != 1 || + EVP_DigestFinal(ctx, md, &olen) != 1) goto failed; - if (EVP_DigestInit(&ctx, dtype) != 1 || - EVP_DigestUpdate(&ctx, key2, SNMP_EXTENDED_KEY_SIZ) != 1 || - EVP_DigestUpdate(&ctx, md, olen) != 1 || - EVP_DigestFinal(&ctx, md, &olen) != 1) + if (EVP_DigestInit(ctx, dtype) != 1 || + EVP_DigestUpdate(ctx, key2, SNMP_EXTENDED_KEY_SIZ) != 1 || + EVP_DigestUpdate(ctx, md, olen) != 1 || + EVP_DigestFinal(ctx, md, &olen) != 1) goto failed; if (olen < SNMP_USM_AUTH_SIZE) { snmp_error("bad digest size - %d", olen); - EVP_MD_CTX_cleanup(&ctx); + EVP_MD_CTX_free(ctx); return (SNMP_CODE_BADDIGEST); } memcpy(digest, md, SNMP_USM_AUTH_SIZE); - EVP_MD_CTX_cleanup(&ctx); + EVP_MD_CTX_free(ctx); return (SNMP_CODE_OK); failed: - EVP_MD_CTX_cleanup(&ctx); + EVP_MD_CTX_free(ctx); return (SNMP_CODE_BADDIGEST); } @@ -176,7 +181,7 @@ snmp_pdu_encrypt(const struct snmp_pdu *pdu) int32_t err, olen; uint8_t iv[SNMP_PRIV_AES_IV_SIZ]; const EVP_CIPHER *ctype; - EVP_CIPHER_CTX ctx; + EVP_CIPHER_CTX *ctx; err = snmp_pdu_cipher_init(pdu, pdu->scoped_len, &ctype, iv); if (err < 0) @@ -184,18 +189,23 @@ snmp_pdu_encrypt(const struct snmp_pdu *pdu) else if (err == 0) return (SNMP_CODE_OK); - if (EVP_EncryptInit(&ctx, ctype, pdu->user.priv_key, iv) != 1) + ctx = EVP_CIPHER_CTX_new(); + if (ctx == NULL) return (SNMP_CODE_FAILED); + if (EVP_EncryptInit(ctx, ctype, pdu->user.priv_key, iv) != 1) + goto failed; - if (EVP_EncryptUpdate(&ctx, pdu->scoped_ptr, &olen, pdu->scoped_ptr, + if (EVP_EncryptUpdate(ctx, pdu->scoped_ptr, &olen, pdu->scoped_ptr, pdu->scoped_len) != 1 || - EVP_EncryptFinal(&ctx, pdu->scoped_ptr + olen, &olen) != 1) { - EVP_CIPHER_CTX_cleanup(&ctx); - return (SNMP_CODE_FAILED); - } + EVP_EncryptFinal(ctx, pdu->scoped_ptr + olen, &olen) != 1) + goto failed; - EVP_CIPHER_CTX_cleanup(&ctx); + EVP_CIPHER_CTX_free(ctx); return (SNMP_CODE_OK); + +failed: + EVP_CIPHER_CTX_free(ctx); + return (SNMP_CODE_FAILED); } enum snmp_code @@ -204,7 +214,7 @@ snmp_pdu_decrypt(const struct snmp_pdu *pdu) int32_t err, olen; uint8_t iv[SNMP_PRIV_AES_IV_SIZ]; const EVP_CIPHER *ctype; - EVP_CIPHER_CTX ctx; + EVP_CIPHER_CTX *ctx; err = snmp_pdu_cipher_init(pdu, pdu->scoped_len, &ctype, iv); if (err < 0) @@ -212,19 +222,24 @@ snmp_pdu_decrypt(const struct snmp_pdu *pdu) else if (err == 0) return (SNMP_CODE_OK); - if (EVP_DecryptInit(&ctx, ctype, pdu->user.priv_key, iv) != 1 || - EVP_CIPHER_CTX_set_padding(&ctx, 0) != 1) - return (SNMP_CODE_EDECRYPT); + ctx = EVP_CIPHER_CTX_new(); + if (ctx == NULL) + return (SNMP_CODE_FAILED); + if (EVP_DecryptInit(ctx, ctype, pdu->user.priv_key, iv) != 1 || + EVP_CIPHER_CTX_set_padding(ctx, 0) != 1) + goto failed; - if (EVP_DecryptUpdate(&ctx, pdu->scoped_ptr, &olen, pdu->scoped_ptr, + if (EVP_DecryptUpdate(ctx, pdu->scoped_ptr, &olen, pdu->scoped_ptr, pdu->scoped_len) != 1 || - EVP_DecryptFinal(&ctx, pdu->scoped_ptr + olen, &olen) != 1) { - EVP_CIPHER_CTX_cleanup(&ctx); - return (SNMP_CODE_EDECRYPT); - } + EVP_DecryptFinal(ctx, pdu->scoped_ptr + olen, &olen) != 1) + goto failed; - EVP_CIPHER_CTX_cleanup(&ctx); + EVP_CIPHER_CTX_free(ctx); return (SNMP_CODE_OK); + +failed: + EVP_CIPHER_CTX_free(ctx); + return (SNMP_CODE_EDECRYPT); } /* [RFC 3414] - A.2. Password to Key Algorithm */ @@ -234,13 +249,19 @@ snmp_passwd_to_keys(struct snmp_user *user, char *pass int err, loop, i, pwdlen; uint32_t keylen, olen; const EVP_MD *dtype; - EVP_MD_CTX ctx; + EVP_MD_CTX *ctx; uint8_t authbuf[SNMP_AUTH_BUF_SIZE]; if (passwd == NULL || user == NULL) return (SNMP_CODE_FAILED); - err = snmp_digest_init(user, &ctx, &dtype, &keylen); + ctx = EVP_MD_CTX_new(); + if (ctx == NULL) + return (SNMP_CODE_FAILED); + + err = snmp_digest_init(user, ctx, &dtype, &keylen); + if (err <= 0) + EVP_MD_CTX_free(ctx); if (err < 0) return (SNMP_CODE_BADDIGEST); else if (err == 0) @@ -252,18 +273,18 @@ snmp_passwd_to_keys(struct snmp_user *user, char *pass for (loop = 0; loop < SNMP_AUTH_KEY_LOOPCNT; loop += i) { for (i = 0; i < SNMP_EXTENDED_KEY_SIZ; i++) authbuf[i] = passwd[(loop + i) % pwdlen]; - if (EVP_DigestUpdate(&ctx, authbuf, SNMP_EXTENDED_KEY_SIZ) != 1) + if (EVP_DigestUpdate(ctx, authbuf, SNMP_EXTENDED_KEY_SIZ) != 1) goto failed; } - if (EVP_DigestFinal(&ctx, user->auth_key, &olen) != 1) + if (EVP_DigestFinal(ctx, user->auth_key, &olen) != 1) goto failed; - EVP_MD_CTX_cleanup(&ctx); + EVP_MD_CTX_free(ctx); return (SNMP_CODE_OK); failed: - EVP_MD_CTX_cleanup(&ctx); + EVP_MD_CTX_free(ctx); return (SNMP_CODE_BADDIGEST); } @@ -274,16 +295,22 @@ snmp_get_local_keys(struct snmp_user *user, uint8_t *e int err; uint32_t keylen, olen; const EVP_MD *dtype; - EVP_MD_CTX ctx; + EVP_MD_CTX *ctx; uint8_t authbuf[SNMP_AUTH_BUF_SIZE]; if (user == NULL || eid == NULL || elen > SNMP_ENGINE_ID_SIZ) return (SNMP_CODE_FAILED); + ctx = EVP_MD_CTX_new(); + if (ctx == NULL) + return (SNMP_CODE_FAILED); + memset(user->priv_key, 0, sizeof(user->priv_key)); memset(authbuf, 0, sizeof(authbuf)); - err = snmp_digest_init(user, &ctx, &dtype, &keylen); + err = snmp_digest_init(user, ctx, &dtype, &keylen); + if (err <= 0) + EVP_MD_CTX_free(ctx); if (err < 0) return (SNMP_CODE_BADDIGEST); else if (err == 0) @@ -293,12 +320,12 @@ snmp_get_local_keys(struct snmp_user *user, uint8_t *e memcpy(authbuf + keylen, eid, elen); memcpy(authbuf + keylen + elen, user->auth_key, keylen); - if (EVP_DigestUpdate(&ctx, authbuf, 2 * keylen + elen) != 1 || - EVP_DigestFinal(&ctx, user->auth_key, &olen) != 1) { - EVP_MD_CTX_cleanup(&ctx); + if (EVP_DigestUpdate(ctx, authbuf, 2 * keylen + elen) != 1 || + EVP_DigestFinal(ctx, user->auth_key, &olen) != 1) { + EVP_MD_CTX_free(ctx); return (SNMP_CODE_BADDIGEST); } - EVP_MD_CTX_cleanup(&ctx); + EVP_MD_CTX_free(ctx); if (user->priv_proto != SNMP_PRIV_NOPRIV) memcpy(user->priv_key, user->auth_key, sizeof(user->priv_key)); @@ -312,9 +339,15 @@ snmp_calc_keychange(struct snmp_user *user, uint8_t *k int32_t err, rvalue[SNMP_AUTH_HMACSHA_KEY_SIZ / 4]; uint32_t i, keylen, olen; const EVP_MD *dtype; - EVP_MD_CTX ctx; + EVP_MD_CTX *ctx; - err = snmp_digest_init(user, &ctx, &dtype, &keylen); + ctx = EVP_MD_CTX_new(); + if (ctx == NULL) + return (SNMP_CODE_FAILED); + + err = snmp_digest_init(user, ctx, &dtype, &keylen); + if (err <= 0) + EVP_MD_CTX_free(ctx); if (err < 0) return (SNMP_CODE_BADDIGEST); else if (err == 0) @@ -326,13 +359,13 @@ snmp_calc_keychange(struct snmp_user *user, uint8_t *k memcpy(keychange, user->auth_key, keylen); memcpy(keychange + keylen, rvalue, keylen); - if (EVP_DigestUpdate(&ctx, keychange, 2 * keylen) != 1 || - EVP_DigestFinal(&ctx, keychange, &olen) != 1) { - EVP_MD_CTX_cleanup(&ctx); + if (EVP_DigestUpdate(ctx, keychange, 2 * keylen) != 1 || + EVP_DigestFinal(ctx, keychange, &olen) != 1) { + EVP_MD_CTX_free(ctx); return (SNMP_CODE_BADDIGEST); } - EVP_MD_CTX_cleanup(&ctx); + EVP_MD_CTX_free(ctx); return (SNMP_CODE_OK); } Modified: head/contrib/dma/crypto.c ============================================================================== --- head/contrib/dma/crypto.c Tue Oct 9 20:42:17 2018 (r339269) +++ head/contrib/dma/crypto.c Tue Oct 9 21:28:26 2018 (r339270) @@ -40,6 +40,7 @@ #include #include +#include #include #include "dma.h" Modified: head/contrib/dma/dma-mbox-create.c ============================================================================== --- head/contrib/dma/dma-mbox-create.c Tue Oct 9 20:42:17 2018 (r339269) +++ head/contrib/dma/dma-mbox-create.c Tue Oct 9 21:28:26 2018 (r339270) @@ -56,6 +56,7 @@ #include #include #include +#include #include #include Modified: head/contrib/dma/local.c ============================================================================== --- head/contrib/dma/local.c Tue Oct 9 20:42:17 2018 (r339269) +++ head/contrib/dma/local.c Tue Oct 9 21:28:26 2018 (r339270) @@ -44,6 +44,7 @@ #include #include #include +#include #include #include Modified: head/contrib/dma/mail.c ============================================================================== --- head/contrib/dma/mail.c Tue Oct 9 20:42:17 2018 (r339269) +++ head/contrib/dma/mail.c Tue Oct 9 21:28:26 2018 (r339270) @@ -36,6 +36,7 @@ #include #include #include +#include #include #include Modified: head/contrib/dma/net.c ============================================================================== --- head/contrib/dma/net.c Tue Oct 9 20:42:17 2018 (r339269) +++ head/contrib/dma/net.c Tue Oct 9 21:28:26 2018 (r339270) @@ -53,6 +53,7 @@ #include #include #include +#include #include #include Modified: head/contrib/dma/spool.c ============================================================================== --- head/contrib/dma/spool.c Tue Oct 9 20:42:17 2018 (r339269) +++ head/contrib/dma/spool.c Tue Oct 9 21:28:26 2018 (r339270) @@ -45,6 +45,7 @@ #include #include #include +#include #include #include "dma.h" Modified: head/contrib/dma/util.c ============================================================================== --- head/contrib/dma/util.c Tue Oct 9 20:42:17 2018 (r339269) +++ head/contrib/dma/util.c Tue Oct 9 21:28:26 2018 (r339270) @@ -44,6 +44,7 @@ #include #include #include +#include #include #include Modified: head/contrib/ldns/ldns/config.h ============================================================================== --- head/contrib/ldns/ldns/config.h Tue Oct 9 20:42:17 2018 (r339269) +++ head/contrib/ldns/ldns/config.h Tue Oct 9 21:28:26 2018 (r339270) @@ -60,19 +60,19 @@ #define HAVE_DLFCN_H 1 /* Define to 1 if you have the `DSA_get0_key' function. */ -/* #undef HAVE_DSA_GET0_KEY */ +#define HAVE_DSA_GET0_KEY 1 /* Define to 1 if you have the `DSA_get0_pqg' function. */ -/* #undef HAVE_DSA_GET0_PQG */ +#define HAVE_DSA_GET0_PQG 1 /* Define to 1 if you have the `DSA_SIG_get0' function. */ -/* #undef HAVE_DSA_SIG_GET0 */ +#define HAVE_DSA_SIG_GET0 1 /* Define to 1 if you have the `DSA_SIG_set0' function. */ -/* #undef HAVE_DSA_SIG_SET0 */ +#define HAVE_DSA_SIG_SET0 1 /* Define to 1 if you have the `ECDSA_SIG_get0' function. */ -/* #undef HAVE_ECDSA_SIG_GET0 */ +#define HAVE_ECDSA_SIG_GET0 1 /* Define to 1 if you have the `endprotoent' function. */ #define HAVE_ENDPROTOENT 1 @@ -84,10 +84,10 @@ #define HAVE_ENGINE_LOAD_CRYPTODEV 1 /* Define to 1 if you have the `EVP_dss1' function. */ -#define HAVE_EVP_DSS1 1 +/* #undef HAVE_EVP_DSS1 */ /* Define to 1 if you have the `EVP_MD_CTX_new' function. */ -/* #undef HAVE_EVP_MD_CTX_NEW */ +#define HAVE_EVP_MD_CTX_NEW 1 /* Define to 1 if you have the `EVP_PKEY_base_id' function. */ #define HAVE_EVP_PKEY_BASE_ID 1 Modified: head/contrib/openbsm/bin/auditdistd/proto_tls.c ============================================================================== --- head/contrib/openbsm/bin/auditdistd/proto_tls.c Tue Oct 9 20:42:17 2018 (r339269) +++ head/contrib/openbsm/bin/auditdistd/proto_tls.c Tue Oct 9 21:28:26 2018 (r339270) @@ -379,7 +379,7 @@ tls_exec_client(const char *user, int startfd, const c * libcrypto use sysctl kern.arandom to obtain random data * instead of /dev/urandom and friends. */ - sslctx = SSL_CTX_new(TLSv1_client_method()); + sslctx = SSL_CTX_new(TLS_client_method()); if (sslctx == NULL) pjdlog_exitx(EX_TEMPFAIL, "SSL_CTX_new() failed."); @@ -666,7 +666,7 @@ tls_exec_server(const char *user, int startfd, const c SSL_load_error_strings(); SSL_library_init(); - sslctx = SSL_CTX_new(TLSv1_server_method()); + sslctx = SSL_CTX_new(TLS_server_method()); if (sslctx == NULL) pjdlog_exitx(EX_TEMPFAIL, "SSL_CTX_new() failed."); Modified: head/contrib/telnet/libtelnet/enc_des.c ============================================================================== --- head/contrib/telnet/libtelnet/enc_des.c Tue Oct 9 20:42:17 2018 (r339269) +++ head/contrib/telnet/libtelnet/enc_des.c Tue Oct 9 21:28:26 2018 (r339270) @@ -207,9 +207,9 @@ fb64_start(struct fb *fbp, int dir, int server __unuse /* * Create a random feed and send it over. */ - des_random_key((Block *)fbp->temp_feed); - des_ecb_encrypt((Block *)fbp->temp_feed, (Block *)fbp->temp_feed, - fbp->krbdes_sched, 1); + DES_random_key((Block *)fbp->temp_feed); + DES_ecb_encrypt((Block *)fbp->temp_feed, (Block *)fbp->temp_feed, + &fbp->krbdes_sched, 1); p = fbp->fb_feed + 3; *p++ = ENCRYPT_IS; p++; @@ -393,7 +393,7 @@ fb64_session(Session_Key *key, int server, struct fb * fb64_stream_key(fbp->krbdes_key, &fbp->streams[DIR_ENCRYPT-1]); fb64_stream_key(fbp->krbdes_key, &fbp->streams[DIR_DECRYPT-1]); - des_key_sched((Block *)fbp->krbdes_key, fbp->krbdes_sched); + DES_key_sched((Block *)fbp->krbdes_key, &fbp->krbdes_sched); /* * Now look to see if krbdes_start() was was waiting for * the key to show up. If so, go ahead an call it now @@ -499,7 +499,7 @@ fb64_stream_iv(Block seed, struct stinfo *stp) memmove((void *)stp->str_iv, (void *)seed, sizeof(Block)); memmove((void *)stp->str_output, (void *)seed, sizeof(Block)); - des_key_sched((Block *)stp->str_ikey, stp->str_sched); + DES_key_sched((Block *)stp->str_ikey, &stp->str_sched); stp->str_index = sizeof(Block); } @@ -508,7 +508,7 @@ void fb64_stream_key(Block key, struct stinfo *stp) { memmove((void *)stp->str_ikey, (void *)key, sizeof(Block)); - des_key_sched((Block *)key, stp->str_sched); + DES_key_sched((Block *)key, &stp->str_sched); memmove((void *)stp->str_output, (void *)stp->str_iv, sizeof(Block)); @@ -547,7 +547,7 @@ cfb64_encrypt(unsigned char *s, int c) while (c-- > 0) { if (idx == sizeof(Block)) { Block b; - des_ecb_encrypt((Block *)stp->str_output, (Block *)b, stp->str_sched, 1); + DES_ecb_encrypt((Block *)stp->str_output, (Block *)b, &stp->str_sched, 1); memmove((void *)stp->str_feed, (void *)b, sizeof(Block)); idx = 0; } @@ -580,7 +580,7 @@ cfb64_decrypt(int data) idx = stp->str_index++; if (idx == sizeof(Block)) { Block b; - des_ecb_encrypt((Block *)stp->str_output, (Block *)b, stp->str_sched, 1); + DES_ecb_encrypt((Block *)stp->str_output, (Block *)b, &stp->str_sched, 1); memmove((void *)stp->str_feed, (void *)b, sizeof(Block)); stp->str_index = 1; /* Next time will be 1 */ idx = 0; /* But now use 0 */ @@ -620,7 +620,7 @@ ofb64_encrypt(unsigned char *s, int c) while (c-- > 0) { if (idx == sizeof(Block)) { Block b; - des_ecb_encrypt((Block *)stp->str_feed, (Block *)b, stp->str_sched, 1); + DES_ecb_encrypt((Block *)stp->str_feed, (Block *)b, &stp->str_sched, 1); memmove((void *)stp->str_feed, (void *)b, sizeof(Block)); idx = 0; } @@ -650,7 +650,7 @@ ofb64_decrypt(int data) idx = stp->str_index++; if (idx == sizeof(Block)) { Block b; - des_ecb_encrypt((Block *)stp->str_feed, (Block *)b, stp->str_sched, 1); + DES_ecb_encrypt((Block *)stp->str_feed, (Block *)b, &stp->str_sched, 1); memmove((void *)stp->str_feed, (void *)b, sizeof(Block)); stp->str_index = 1; /* Next time will be 1 */ idx = 0; /* But now use 0 */ Modified: head/contrib/telnet/libtelnet/encrypt.h ============================================================================== --- head/contrib/telnet/libtelnet/encrypt.h Tue Oct 9 20:42:17 2018 (r339269) +++ head/contrib/telnet/libtelnet/encrypt.h Tue Oct 9 21:28:26 2018 (r339270) @@ -67,7 +67,7 @@ typedef unsigned char *BlockT; #if 0 typedef struct { Block __; } Schedule[16]; #else -#define Schedule des_key_schedule +#define Schedule DES_key_schedule #endif #define VALIDKEY(key) ( key[0] | key[1] | key[2] | key[3] | \ Modified: head/contrib/telnet/libtelnet/kerberos.c ============================================================================== --- head/contrib/telnet/libtelnet/kerberos.c Tue Oct 9 20:42:17 2018 (r339269) +++ head/contrib/telnet/libtelnet/kerberos.c Tue Oct 9 21:28:26 2018 (r339270) @@ -91,7 +91,7 @@ static char name[ANAME_SZ]; static AUTH_DAT adat = { 0, "", "", "", 0, {}, 0, 0, 0, { 0, "", 0 } }; #ifdef ENCRYPTION static Block session_key = { 0 }; -static des_key_schedule sched; +static DES_key_schedule sched; static Block challenge = { 0 }; #endif /* ENCRYPTION */ @@ -206,10 +206,10 @@ kerberos4_send(Authenticator *ap) if ((ap->way & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) { register int i; - des_key_sched(&cred.session, sched); - des_random_key(&session_key); - des_ecb_encrypt(&session_key, &session_key, sched, 0); - des_ecb_encrypt(&session_key, &challenge, sched, 0); + DES_key_sched(&cred.session, sched); + DES_random_key(&session_key); + DES_ecb_encrypt(&session_key, &session_key, sched, 0); + DES_ecb_encrypt(&session_key, &challenge, sched, 0); /* * Increment the challenge by 1, and encrypt it for * later comparison. @@ -221,7 +221,7 @@ kerberos4_send(Authenticator *ap) if (x < 256) /* if no overflow, all done */ break; } - des_ecb_encrypt(&challenge, &challenge, sched, 1); + DES_ecb_encrypt(&challenge, &challenge, sched, 1); } #endif /* ENCRYPTION */ @@ -298,14 +298,14 @@ kerberos4_is(Authenticator *ap, unsigned char *data, i break; } - des_key_sched(&session_key, sched); + DES_key_sched(&session_key, sched); memmove((void *)datablock, (void *)data, sizeof(Block)); /* * Take the received encrypted challenge, and encrypt * it again to get a unique session_key for the * ENCRYPT option. */ - des_ecb_encrypt(&datablock, &session_key, sched, 1); + DES_ecb_encrypt(&datablock, &session_key, sched, 1); skey.type = SK_DES; skey.length = 8; skey.data = session_key; @@ -314,7 +314,7 @@ kerberos4_is(Authenticator *ap, unsigned char *data, i * Now decrypt the received encrypted challenge, * increment by one, re-encrypt it and send it back. */ - des_ecb_encrypt(&datablock, &challenge, sched, 0); + DES_ecb_encrypt(&datablock, &challenge, sched, 0); for (r = 7; r >= 0; r--) { register int t; t = (unsigned int)challenge[r] + 1; @@ -322,7 +322,7 @@ kerberos4_is(Authenticator *ap, unsigned char *data, i if (t < 256) /* if no overflow, all done */ break; } - des_ecb_encrypt(&challenge, &challenge, sched, 1); + DES_ecb_encrypt(&challenge, &challenge, sched, 1); Data(ap, KRB_RESPONSE, challenge, sizeof(challenge)); #endif /* ENCRYPTION */ break; @@ -364,7 +364,7 @@ kerberos4_reply(Authenticator *ap, unsigned char *data #else /* ENCRYPTION */ Data(ap, KRB_CHALLENGE, session_key, sizeof(session_key)); - des_ecb_encrypt(&session_key, &session_key, sched, 1); + DES_ecb_encrypt(&session_key, &session_key, sched, 1); skey.type = SK_DES; skey.length = 8; skey.data = session_key; Modified: head/contrib/telnet/libtelnet/pk.c ============================================================================== --- head/contrib/telnet/libtelnet/pk.c Tue Oct 9 20:42:17 2018 (r339269) +++ head/contrib/telnet/libtelnet/pk.c Tue Oct 9 21:28:26 2018 (r339270) @@ -129,7 +129,7 @@ common_key(char *xsecret, char *xpublic, IdeaData *ide mp_pow(public, secret, modulus, common); extractdeskey(common, deskey); extractideakey(common, ideakey); - des_set_odd_parity(deskey); + DES_set_odd_parity(deskey); mp_mfree(common); mp_mfree(secret); mp_mfree(public); @@ -221,14 +221,14 @@ pk_encode(char *in, char *out, DesData *key) { char buf[256]; DesData i; - des_key_schedule k; + DES_key_schedule k; int l,op,deslen; memset(&i,0,sizeof(i)); memset(buf,0,sizeof(buf)); deslen = ((strlen(in) + 7)/8)*8; - des_key_sched(key, k); - des_cbc_encrypt(in,buf,deslen, k,&i,DES_ENCRYPT); + DES_key_sched(key, &k); + DES_cbc_encrypt(in, buf, deslen, &k, &i, DES_ENCRYPT); for (l=0,op=0;l> 4]; out[op++] = hextab[(buf[l] & 0x0f)]; @@ -242,7 +242,7 @@ pk_decode(char *in, char *out, DesData *key) { char buf[256]; DesData i; - des_key_schedule k; + DES_key_schedule k; int n1,n2,op; size_t l; @@ -259,7 +259,7 @@ pk_decode(char *in, char *out, DesData *key) n2 = in[op+1] - '0'; buf[l] = n1*16 +n2; } - des_key_sched(key, k); - des_cbc_encrypt(buf,out,strlen(in)/2, k,&i,DES_DECRYPT); + DES_key_sched(key, &k); + DES_cbc_encrypt(buf, out, strlen(in) / 2, &k, &i, DES_DECRYPT); out[strlen(in)/2] = '\0'; } Modified: head/contrib/telnet/libtelnet/pk.h ============================================================================== --- head/contrib/telnet/libtelnet/pk.h Tue Oct 9 20:42:17 2018 (r339269) +++ head/contrib/telnet/libtelnet/pk.h Tue Oct 9 21:28:26 2018 (r339270) @@ -32,7 +32,7 @@ /* header for the des routines that we will use */ typedef unsigned char byte, DesData[ 8], IdeaData[16]; -#define DesKeys des_key_schedule +#define DesKeys DES_key_schedule #define DES_DECRYPT 0 #define DES_ENCRYPT 1 Modified: head/contrib/unbound/config.h ============================================================================== --- head/contrib/unbound/config.h Tue Oct 9 20:42:17 2018 (r339269) +++ head/contrib/unbound/config.h Tue Oct 9 21:28:26 2018 (r339270) @@ -135,7 +135,7 @@ #define HAVE_DLFCN_H 1 /* Define to 1 if you have the `DSA_SIG_set0' function. */ -/* #undef HAVE_DSA_SIG_SET0 */ +#define HAVE_DSA_SIG_SET0 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_ENDIAN_H */ @@ -177,10 +177,10 @@ /* #undef HAVE_EVP_DIGESTVERIFY */ /* Define to 1 if you have the `EVP_dss1' function. */ -#define HAVE_EVP_DSS1 1 +/* #undef HAVE_EVP_DSS1 */ /* Define to 1 if you have the `EVP_MD_CTX_new' function. */ -/* #undef HAVE_EVP_MD_CTX_NEW */ +#define HAVE_EVP_MD_CTX_NEW 1 /* Define to 1 if you have the `EVP_sha1' function. */ #define HAVE_EVP_SHA1 1 Modified: head/crypto/heimdal/kdc/digest.c ============================================================================== --- head/crypto/heimdal/kdc/digest.c Tue Oct 9 20:42:17 2018 (r339269) +++ head/crypto/heimdal/kdc/digest.c Tue Oct 9 21:28:26 2018 (r339270) @@ -375,8 +375,8 @@ _kdc_do_digest(krb5_context context, case choice_DigestReqInner_init: { unsigned char server_nonce[16], identifier; - RAND_pseudo_bytes(&identifier, sizeof(identifier)); - RAND_pseudo_bytes(server_nonce, sizeof(server_nonce)); + RAND_bytes(&identifier, sizeof(identifier)); + RAND_bytes(server_nonce, sizeof(server_nonce)); server_nonce[0] = kdc_time & 0xff; server_nonce[1] = (kdc_time >> 8) & 0xff; @@ -1333,7 +1333,7 @@ _kdc_do_digest(krb5_context context, if (ireq.u.ntlmRequest.sessionkey) { unsigned char masterkey[MD4_DIGEST_LENGTH]; - EVP_CIPHER_CTX rc4; + EVP_CIPHER_CTX *rc4; size_t len; if ((flags & NTLM_NEG_KEYEX) == 0) { @@ -1354,12 +1354,18 @@ _kdc_do_digest(krb5_context context, } - EVP_CIPHER_CTX_init(&rc4); - EVP_CipherInit_ex(&rc4, EVP_rc4(), NULL, sessionkey, NULL, 1); - EVP_Cipher(&rc4, + rc4 = EVP_CIPHER_CTX_new(); + if (rc4 == NULL) { + ret = ENOMEM; + krb5_set_error_message(context, ret, + "NTLM failed to malloc cipher context"); + goto failed; + } + EVP_CipherInit_ex(rc4, EVP_rc4(), NULL, sessionkey, NULL, 1); + EVP_Cipher(rc4, masterkey, ireq.u.ntlmRequest.sessionkey->data, sizeof(masterkey)); - EVP_CIPHER_CTX_cleanup(&rc4); + EVP_CIPHER_CTX_free(rc4); r.u.ntlmResponse.sessionkey = malloc(sizeof(*r.u.ntlmResponse.sessionkey)); Modified: head/crypto/heimdal/kdc/kx509.c ============================================================================== --- head/crypto/heimdal/kdc/kx509.c Tue Oct 9 20:42:17 2018 (r339269) +++ head/crypto/heimdal/kdc/kx509.c Tue Oct 9 21:28:26 2018 (r339270) @@ -64,7 +64,7 @@ verify_req_hash(krb5_context context, krb5_keyblock *key) { unsigned char digest[SHA_DIGEST_LENGTH]; - HMAC_CTX ctx; + HMAC_CTX *ctx; if (req->pk_hash.length != sizeof(digest)) { krb5_set_error_message(context, KRB5KDC_ERR_PREAUTH_FAILED, @@ -73,16 +73,21 @@ verify_req_hash(krb5_context context, return KRB5KDC_ERR_PREAUTH_FAILED; } - HMAC_CTX_init(&ctx); - HMAC_Init_ex(&ctx, + ctx = HMAC_CTX_new(); + if (ctx == NULL) { + krb5_set_error_message(context, ENOMEM, + "HMAC context malloc failed"); + return ENOMEM; + } + HMAC_Init_ex(ctx, key->keyvalue.data, key->keyvalue.length, EVP_sha1(), NULL); - if (sizeof(digest) != HMAC_size(&ctx)) + if (sizeof(digest) != HMAC_size(ctx)) krb5_abortx(context, "runtime error, hmac buffer wrong size in kx509"); - HMAC_Update(&ctx, version_2_0, sizeof(version_2_0)); - HMAC_Update(&ctx, req->pk_key.data, req->pk_key.length); - HMAC_Final(&ctx, digest, 0); - HMAC_CTX_cleanup(&ctx); + HMAC_Update(ctx, version_2_0, sizeof(version_2_0)); + HMAC_Update(ctx, req->pk_key.data, req->pk_key.length); + HMAC_Final(ctx, digest, 0); + HMAC_CTX_free(ctx); if (memcmp(req->pk_hash.data, digest, sizeof(digest)) != 0) { krb5_set_error_message(context, KRB5KDC_ERR_PREAUTH_FAILED, @@ -98,35 +103,40 @@ calculate_reply_hash(krb5_context context, Kx509Response *rep) { krb5_error_code ret; - HMAC_CTX ctx; + HMAC_CTX *ctx; - HMAC_CTX_init(&ctx); + ctx = HMAC_CTX_new(); + if (ctx == NULL) { + krb5_set_error_message(context, ENOMEM, + "HMAC context malloc failed"); + return ENOMEM; + } - HMAC_Init_ex(&ctx, key->keyvalue.data, key->keyvalue.length, + HMAC_Init_ex(ctx, key->keyvalue.data, key->keyvalue.length, EVP_sha1(), NULL); - ret = krb5_data_alloc(rep->hash, HMAC_size(&ctx)); + ret = krb5_data_alloc(rep->hash, HMAC_size(ctx)); if (ret) { - HMAC_CTX_cleanup(&ctx); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@freebsd.org Tue Oct 9 21:54:59 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 04C7710BEF87; Tue, 9 Oct 2018 21:54:59 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AECC980933; Tue, 9 Oct 2018 21:54:58 +0000 (UTC) (envelope-from gjb@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A9BB818046; Tue, 9 Oct 2018 21:54:58 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w99Lsw8Q051270; Tue, 9 Oct 2018 21:54:58 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w99Lswa7051269; Tue, 9 Oct 2018 21:54:58 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201810092154.w99Lswa7051269@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 9 Oct 2018 21:54:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339271 - head/sys/conf X-SVN-Group: head X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: head/sys/conf X-SVN-Commit-Revision: 339271 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.27 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: Tue, 09 Oct 2018 21:54:59 -0000 Author: gjb Date: Tue Oct 9 21:54:58 2018 New Revision: 339271 URL: https://svnweb.freebsd.org/changeset/base/339271 Log: Update head from ALPHA8 to ALPHA9 as part of the 12.0-RELEASE cycle. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: head/sys/conf/newvers.sh Modified: head/sys/conf/newvers.sh ============================================================================== --- head/sys/conf/newvers.sh Tue Oct 9 21:28:26 2018 (r339270) +++ head/sys/conf/newvers.sh Tue Oct 9 21:54:58 2018 (r339271) @@ -46,7 +46,7 @@ TYPE="FreeBSD" REVISION="12.0" -BRANCH="ALPHA8" +BRANCH="ALPHA9" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From owner-svn-src-head@freebsd.org Tue Oct 9 22:22:16 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 02A2810BFCCB; Tue, 9 Oct 2018 22:22:16 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AD44F818AB; Tue, 9 Oct 2018 22:22:15 +0000 (UTC) (envelope-from brooks@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A8543184F8; Tue, 9 Oct 2018 22:22:15 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w99MMF2a066730; Tue, 9 Oct 2018 22:22:15 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w99MMF1k066729; Tue, 9 Oct 2018 22:22:15 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201810092222.w99MMF1k066729@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Tue, 9 Oct 2018 22:22:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339272 - head X-SVN-Group: head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 339272 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.27 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: Tue, 09 Oct 2018 22:22:16 -0000 Author: brooks Date: Tue Oct 9 22:22:15 2018 New Revision: 339272 URL: https://svnweb.freebsd.org/changeset/base/339272 Log: Don't include the broken riscv64sf TARGET_ARCH in universe. riscv64sf has been broken due to duplicate symbols for months and degrades the quality of universe builds. Remove it until this is resolved leaving a comment to it is not re-added. PR: 232085 Reviewed by: emaste Approved by: re (gjb, kib) Sponsored by: DARPA, AFRL Modified: head/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Tue Oct 9 21:54:58 2018 (r339271) +++ head/Makefile Tue Oct 9 22:22:15 2018 (r339272) @@ -488,7 +488,8 @@ TARGET_ARCHES_arm?= arm armv6 armv7 TARGET_ARCHES_arm64?= aarch64 TARGET_ARCHES_mips?= mipsel mips mips64el mips64 mipsn32 mipselhf mipshf mips64elhf mips64hf TARGET_ARCHES_powerpc?= powerpc powerpc64 powerpcspe -TARGET_ARCHES_riscv?= riscv64 riscv64sf +# riscv64sf excluded due to PR 232085 +TARGET_ARCHES_riscv?= riscv64 .for target in ${TARGETS} TARGET_ARCHES_${target}?= ${target} .endfor From owner-svn-src-head@freebsd.org Wed Oct 10 00:20:41 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8A97810C32E7; Wed, 10 Oct 2018 00:20:41 +0000 (UTC) (envelope-from yuripv@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3FA8B86154; Wed, 10 Oct 2018 00:20:41 +0000 (UTC) (envelope-from yuripv@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 20912197C6; Wed, 10 Oct 2018 00:20:41 +0000 (UTC) (envelope-from yuripv@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9A0Kfc3024303; Wed, 10 Oct 2018 00:20:41 GMT (envelope-from yuripv@FreeBSD.org) Received: (from yuripv@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9A0Kemd024302; Wed, 10 Oct 2018 00:20:40 GMT (envelope-from yuripv@FreeBSD.org) Message-Id: <201810100020.w9A0Kemd024302@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuripv set sender to yuripv@FreeBSD.org using -f From: Yuri Pankov Date: Wed, 10 Oct 2018 00:20:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339274 - in head: share/misc usr.bin/calendar/calendars X-SVN-Group: head X-SVN-Commit-Author: yuripv X-SVN-Commit-Paths: in head: share/misc usr.bin/calendar/calendars X-SVN-Commit-Revision: 339274 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.27 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: Wed, 10 Oct 2018 00:20:41 -0000 Author: yuripv Date: Wed Oct 10 00:20:40 2018 New Revision: 339274 URL: https://svnweb.freebsd.org/changeset/base/339274 Log: Add myself to committers-src.dot and calendar.freebsd. Approved by: re (gjb), kib (mentor) Modified: head/share/misc/committers-src.dot head/usr.bin/calendar/calendars/calendar.freebsd Modified: head/share/misc/committers-src.dot ============================================================================== --- head/share/misc/committers-src.dot Tue Oct 9 22:35:43 2018 (r339273) +++ head/share/misc/committers-src.dot Wed Oct 10 00:20:40 2018 (r339274) @@ -358,6 +358,7 @@ wollman [label="Garrett Wollman\nwollman@FreeBSD.org\n wsalamon [label="Wayne Salamon\nwsalamon@FreeBSD.org\n2005/06/25"] wulf [label="Vladimir Kondratyev\nwulf@FreeBSD.org\n2017/04/27"] yongari [label="Pyun YongHyeon\nyongari@FreeBSD.org\n2004/08/01"] +yuripv [label="Yuri Pankov\nyuripv@FreeBSD.org\n2018/10/09"] zbb [label="Zbigniew Bodek\nzbb@FreeBSD.org\n2013/09/02"] zec [label="Marko Zec\nzec@FreeBSD.org\n2008/06/22"] zml [label="Zachary Loafman\nzml@FreeBSD.org\n2009/05/27"] @@ -674,6 +675,7 @@ kib -> stas kib -> tijl kib -> trociny kib -> vangyzen +kib -> yuripv kib -> zont kmacy -> lstewart Modified: head/usr.bin/calendar/calendars/calendar.freebsd ============================================================================== --- head/usr.bin/calendar/calendars/calendar.freebsd Tue Oct 9 22:35:43 2018 (r339273) +++ head/usr.bin/calendar/calendars/calendar.freebsd Wed Oct 10 00:20:40 2018 (r339274) @@ -331,6 +331,7 @@ 08/28 Norikatsu Shigemura born in Fujisawa, Kanagawa, Japan, 1974 08/29 Thomas Gellekum born in Moenchengladbach, Nordrhein-Westfalen, Germany, 1967 08/29 Max Laier born in Karlsruhe, Germany, 1981 +08/30 Yuri Pankov born in Krasnodar, USSR, 1979 09/01 Pyun YongHyeon born in Kimcheon, Korea, 1968 09/01 William Grzybowski born in Parana, Brazil, 1988 09/03 Max Khon born in Novosibirsk, USSR, 1976 From owner-svn-src-head@freebsd.org Wed Oct 10 07:55:09 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 454BD10CB996; Wed, 10 Oct 2018 07:55:09 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DF85E731B1; Wed, 10 Oct 2018 07:55:08 +0000 (UTC) (envelope-from des@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C08D01E172; Wed, 10 Oct 2018 07:55:08 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9A7t8pp065680; Wed, 10 Oct 2018 07:55:08 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9A7t6UC065668; Wed, 10 Oct 2018 07:55:06 GMT (envelope-from des@FreeBSD.org) Message-Id: <201810100755.w9A7t6UC065668@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Wed, 10 Oct 2018 07:55:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339275 - in head/contrib/unbound: . cachedb contrib daemon dns64 doc edns-subnet ipsecmod iterator libunbound respip services services/cache sldns smallapp util util/data util/storage ... X-SVN-Group: head X-SVN-Commit-Author: des X-SVN-Commit-Paths: in head/contrib/unbound: . cachedb contrib daemon dns64 doc edns-subnet ipsecmod iterator libunbound respip services services/cache sldns smallapp util util/data util/storage validator X-SVN-Commit-Revision: 339275 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.27 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: Wed, 10 Oct 2018 07:55:09 -0000 Author: des Date: Wed Oct 10 07:55:06 2018 New Revision: 339275 URL: https://svnweb.freebsd.org/changeset/base/339275 Log: Upgrade Unbound to 1.8.0. More to follow. Approved by: re (kib) Added: head/contrib/unbound/util/edns.c - copied, changed from r338566, vendor/unbound/dist/util/edns.c head/contrib/unbound/util/edns.h - copied unchanged from r338566, vendor/unbound/dist/util/edns.h head/contrib/unbound/util/tcp_conn_limit.c - copied unchanged from r338566, vendor/unbound/dist/util/tcp_conn_limit.c head/contrib/unbound/util/tcp_conn_limit.h - copied unchanged from r338566, vendor/unbound/dist/util/tcp_conn_limit.h Modified: head/contrib/unbound/Makefile.in head/contrib/unbound/cachedb/cachedb.c head/contrib/unbound/config.h head/contrib/unbound/configure head/contrib/unbound/configure.ac head/contrib/unbound/contrib/fastrpz.patch head/contrib/unbound/contrib/libunbound.pc.in head/contrib/unbound/contrib/unbound.service.in head/contrib/unbound/daemon/cachedump.c head/contrib/unbound/daemon/daemon.c head/contrib/unbound/daemon/daemon.h head/contrib/unbound/daemon/remote.c head/contrib/unbound/daemon/stats.c head/contrib/unbound/daemon/unbound.c head/contrib/unbound/daemon/worker.c head/contrib/unbound/dns64/dns64.c head/contrib/unbound/doc/Changelog head/contrib/unbound/doc/README head/contrib/unbound/doc/example.conf head/contrib/unbound/doc/example.conf.in head/contrib/unbound/doc/libunbound.3 head/contrib/unbound/doc/libunbound.3.in head/contrib/unbound/doc/unbound-anchor.8 head/contrib/unbound/doc/unbound-anchor.8.in head/contrib/unbound/doc/unbound-checkconf.8 head/contrib/unbound/doc/unbound-checkconf.8.in head/contrib/unbound/doc/unbound-control.8 head/contrib/unbound/doc/unbound-control.8.in head/contrib/unbound/doc/unbound-host.1 head/contrib/unbound/doc/unbound-host.1.in head/contrib/unbound/doc/unbound.8 head/contrib/unbound/doc/unbound.8.in head/contrib/unbound/doc/unbound.conf.5 head/contrib/unbound/doc/unbound.conf.5.in head/contrib/unbound/edns-subnet/subnetmod.c head/contrib/unbound/edns-subnet/subnetmod.h head/contrib/unbound/ipsecmod/ipsecmod.c head/contrib/unbound/iterator/iter_delegpt.h head/contrib/unbound/iterator/iter_fwd.c head/contrib/unbound/iterator/iter_hints.c head/contrib/unbound/iterator/iter_utils.c head/contrib/unbound/iterator/iterator.c head/contrib/unbound/iterator/iterator.h head/contrib/unbound/libunbound/context.c head/contrib/unbound/libunbound/libworker.c head/contrib/unbound/libunbound/unbound-event.h head/contrib/unbound/libunbound/unbound.h head/contrib/unbound/libunbound/worker.h head/contrib/unbound/respip/respip.c head/contrib/unbound/services/authzone.c head/contrib/unbound/services/authzone.h head/contrib/unbound/services/cache/dns.c head/contrib/unbound/services/cache/dns.h head/contrib/unbound/services/cache/infra.c head/contrib/unbound/services/cache/rrset.c head/contrib/unbound/services/listen_dnsport.c head/contrib/unbound/services/listen_dnsport.h head/contrib/unbound/services/localzone.c head/contrib/unbound/services/mesh.c head/contrib/unbound/services/mesh.h head/contrib/unbound/services/outside_network.c head/contrib/unbound/sldns/rrdef.c head/contrib/unbound/sldns/rrdef.h head/contrib/unbound/smallapp/unbound-anchor.c head/contrib/unbound/smallapp/unbound-checkconf.c head/contrib/unbound/smallapp/unbound-control.c head/contrib/unbound/smallapp/unbound-host.c head/contrib/unbound/smallapp/worker_cb.c head/contrib/unbound/util/config_file.c head/contrib/unbound/util/config_file.h head/contrib/unbound/util/configlexer.lex head/contrib/unbound/util/configparser.y head/contrib/unbound/util/data/msgparse.h head/contrib/unbound/util/data/msgreply.c head/contrib/unbound/util/data/msgreply.h head/contrib/unbound/util/iana_ports.inc head/contrib/unbound/util/module.c head/contrib/unbound/util/module.h head/contrib/unbound/util/net_help.c head/contrib/unbound/util/netevent.c head/contrib/unbound/util/netevent.h head/contrib/unbound/util/rtt.c head/contrib/unbound/util/storage/slabhash.c head/contrib/unbound/util/storage/slabhash.h head/contrib/unbound/validator/autotrust.c head/contrib/unbound/validator/autotrust.h head/contrib/unbound/validator/val_kcache.c head/contrib/unbound/validator/validator.c Directory Properties: head/contrib/unbound/ (props changed) Modified: head/contrib/unbound/Makefile.in ============================================================================== --- head/contrib/unbound/Makefile.in Wed Oct 10 00:20:40 2018 (r339274) +++ head/contrib/unbound/Makefile.in Wed Oct 10 07:55:06 2018 (r339275) @@ -57,7 +57,7 @@ STRIP=@STRIP@ CC=@CC@ CPPFLAGS=-I. @CPPFLAGS@ PYTHON_CPPFLAGS=-I. @PYTHON_CPPFLAGS@ -CFLAGS=@CFLAGS@ +CFLAGS=-DSRCDIR=$(srcdir) @CFLAGS@ LDFLAGS=@LDFLAGS@ LIBS=@LIBS@ LIBOBJS=@LIBOBJS@ @@ -83,7 +83,7 @@ LINTFLAGS+=@NETBSD_LINTFLAGS@ # compat with OpenBSD LINTFLAGS+="-Dsigset_t=long" # FreeBSD -LINTFLAGS+="-D__uint16_t=uint16_t" "-DEVP_PKEY_ASN1_METHOD=int" "-D_RuneLocale=int" "-D__va_list=va_list" "-D__uint32_t=uint32_t" +LINTFLAGS+="-D__uint16_t=uint16_t" "-DEVP_PKEY_ASN1_METHOD=int" "-D_RuneLocale=int" "-D__va_list=va_list" "-D__uint32_t=uint32_t" "-D_Alignof(x)=x" "-D__aligned(x)=" "-D__requires_exclusive(x)=" "-D__requires_unlocked(x)=" "-D__locks_exclusive(x)=" "-D__trylocks_exclusive(x)=" "-D__unlocks(x)=" "-D__locks_shared(x)=" "-D__trylocks_shared(x)=" INSTALL=$(SHELL) $(srcdir)/install-sh @@ -115,8 +115,9 @@ util/config_file.c util/configlexer.c util/configparse util/shm_side/shm_main.c services/authzone.c \ util/fptr_wlist.c util/locks.c util/log.c util/mini_event.c util/module.c \ util/netevent.c util/net_help.c util/random.c util/rbtree.c util/regional.c \ -util/rtt.c util/storage/dnstree.c util/storage/lookup3.c \ -util/storage/lruhash.c util/storage/slabhash.c util/timehist.c util/tube.c \ +util/rtt.c util/edns.c util/storage/dnstree.c util/storage/lookup3.c \ +util/storage/lruhash.c util/storage/slabhash.c util/tcp_conn_limit.c \ +util/timehist.c util/tube.c \ util/ub_event.c util/ub_event_pluggable.c util/winsock_event.c \ validator/autotrust.c validator/val_anchor.c validator/validator.c \ validator/val_kcache.c validator/val_kentry.c validator/val_neg.c \ @@ -131,9 +132,10 @@ as112.lo msgparse.lo msgreply.lo packed_rrset.lo itera iter_donotq.lo iter_fwd.lo iter_hints.lo iter_priv.lo iter_resptype.lo \ iter_scrub.lo iter_utils.lo localzone.lo mesh.lo modstack.lo view.lo \ outbound_list.lo alloc.lo config_file.lo configlexer.lo configparser.lo \ -fptr_wlist.lo locks.lo log.lo mini_event.lo module.lo net_help.lo \ +fptr_wlist.lo edns.lo locks.lo log.lo mini_event.lo module.lo net_help.lo \ random.lo rbtree.lo regional.lo rtt.lo dnstree.lo lookup3.lo lruhash.lo \ -slabhash.lo timehist.lo tube.lo winsock_event.lo autotrust.lo val_anchor.lo \ +slabhash.lo tcp_conn_limit.lo timehist.lo tube.lo winsock_event.lo \ +autotrust.lo val_anchor.lo \ validator.lo val_kcache.lo val_kentry.lo val_neg.lo val_nsec3.lo val_nsec.lo \ val_secalgo.lo val_sigcrypt.lo val_utils.lo dns64.lo cachedb.lo redis.lo authzone.lo \ $(SUBNET_OBJ) $(PYTHONMOD_OBJ) $(CHECKLOCK_OBJ) $(DNSTAP_OBJ) $(DNSCRYPT_OBJ) \ @@ -170,7 +172,8 @@ UNITTEST_OBJ_LINK=$(UNITTEST_OBJ) worker_cb.lo $(COMMO $(COMPAT_OBJ) DAEMON_SRC=daemon/acl_list.c daemon/cachedump.c daemon/daemon.c \ daemon/remote.c daemon/stats.c daemon/unbound.c daemon/worker.c @WIN_DAEMON_SRC@ -DAEMON_OBJ=acl_list.lo cachedump.lo daemon.lo shm_main.lo remote.lo stats.lo unbound.lo \ +DAEMON_OBJ=acl_list.lo cachedump.lo daemon.lo \ +shm_main.lo remote.lo stats.lo unbound.lo \ worker.lo @WIN_DAEMON_OBJ@ DAEMON_OBJ_LINK=$(DAEMON_OBJ) $(COMMON_OBJ_ALL_SYMBOLS) $(SLDNS_OBJ) \ $(COMPAT_OBJ) @WIN_DAEMON_OBJ_LINK@ @@ -190,7 +193,8 @@ UBANCHOR_OBJ=unbound-anchor.lo UBANCHOR_OBJ_LINK=$(UBANCHOR_OBJ) parseutil.lo \ $(COMPAT_OBJ_WITHOUT_CTIME) @WIN_UBANCHOR_OBJ_LINK@ TESTBOUND_SRC=testcode/testbound.c testcode/testpkts.c \ -daemon/worker.c daemon/acl_list.c daemon/daemon.c daemon/stats.c \ +daemon/worker.c daemon/acl_list.c \ +daemon/daemon.c daemon/stats.c \ testcode/replay.c testcode/fake_event.c TESTBOUND_OBJ=testbound.lo replay.lo fake_event.lo TESTBOUND_OBJ_LINK=$(TESTBOUND_OBJ) testpkts.lo worker.lo acl_list.lo \ @@ -306,10 +310,11 @@ longcheck: longtest test: unittest$(EXEEXT) testbound$(EXEEXT) ./unittest$(EXEEXT) ./testbound$(EXEEXT) -s - for x in testdata/*.rpl; do echo -n "$$x "; if ./testbound$(EXEEXT) -p $$x >/dev/null 2>&1; then echo OK; else echo failed; exit 1; fi done + for x in $(srcdir)/testdata/*.rpl; do echo -n "$$x "; if ./testbound$(EXEEXT) -p $$x >/dev/null 2>&1; then echo OK; else echo failed; exit 1; fi done @echo test OK longtest: tests + if test ! $(srcdir)/testdata -ef ./testdata; then rm -rf testcode testdata; mkdir testcode testdata; cp -R $(srcdir)/testdata/*.sh $(srcdir)/testdata/*.tdir $(srcdir)/testdata/*.rpl $(srcdir)/testdata/*.crpl testdata; cp $(srcdir)/testcode/*.sh testcode; if test ! -d util; then mkdir util; fi; cp $(srcdir)/util/iana_ports.inc util; fi if test -x "`which bash`"; then bash testcode/do-tests.sh; else sh testcode/do-tests.sh; fi lib: libunbound.la unbound.h @@ -587,7 +592,7 @@ iana_update: DEPEND_TMP=depend1073.tmp DEPEND_TMP2=depend1074.tmp DEPEND_TARGET=Makefile -DEPEND_TARGET2=Makefile.in +DEPEND_TARGET2=$(srcdir)/Makefile.in # actions: generate deplines from gcc, # then, filter out home/xx, /usr/xx and /opt/xx lines (some cc already do this) # then, remove empty " \" lines @@ -595,7 +600,8 @@ DEPEND_TARGET2=Makefile.in # then, remove srcdir from the (generated) parser and lexer. # and mention the .lo depend: - (cd $(srcdir) ; $(CC) $(DEPFLAG) $(CPPFLAGS) $(CFLAGS) @PTHREAD_CFLAGS_ONLY@ $(ALL_SRC) $(COMPAT_SRC)) | \ + (BUILDDIR=$$PWD; cd $(srcdir) ; $(CC) $(DEPFLAG) $(CPPFLAGS) $(CFLAGS) -I$$BUILDDIR @PTHREAD_CFLAGS_ONLY@ $(ALL_SRC) $(COMPAT_SRC)) | \ + sed -e 's?'$$PWD'/config.h?config.h?g' | \ sed -e 's!'$$HOME'[^ ]* !!g' -e 's!'$$HOME'[^ ]*$$!!g' \ -e 's!/usr[^ ]* !!g' -e 's!/usr[^ ]*$$!!g' \ -e 's!/opt[^ ]* !!g' -e 's!/opt[^ ]*$$!!g' | \ @@ -763,7 +769,7 @@ mesh.lo mesh.o: $(srcdir)/services/mesh.c config.h $(s $(srcdir)/services/modstack.h $(srcdir)/services/outbound_list.h $(srcdir)/services/cache/dns.h \ $(srcdir)/util/net_help.h $(srcdir)/util/regional.h $(srcdir)/util/data/msgencode.h $(srcdir)/util/timehist.h \ $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h $(srcdir)/util/alloc.h $(srcdir)/util/config_file.h \ - $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h $(srcdir)/services/localzone.h \ + $(srcdir)/util/edns.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h $(srcdir)/services/localzone.h \ $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/util/data/dname.h $(srcdir)/respip/respip.h modstack.lo modstack.o: $(srcdir)/services/modstack.c config.h $(srcdir)/services/modstack.h \ $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ @@ -793,10 +799,11 @@ outside_network.lo outside_network.o: $(srcdir)/servic $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/testcode/checklocks.h \ $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/lruhash.h \ $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rtt.h $(srcdir)/util/data/msgreply.h \ - $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/dname.h $(srcdir)/util/net_help.h \ - $(srcdir)/util/random.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/module.h $(srcdir)/util/tube.h \ - $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h $(srcdir)/sldns/sbuffer.h $(srcdir)/dnstap/dnstap.h \ + $(srcdir)/util/data/packed_rrset.h $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h \ + $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/dname.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h \ + $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h \ + $(srcdir)/sldns/sbuffer.h $(srcdir)/dnstap/dnstap.h \ alloc.lo alloc.o: $(srcdir)/util/alloc.c config.h $(srcdir)/util/alloc.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ $(srcdir)/testcode/checklocks.h $(srcdir)/util/regional.h $(srcdir)/util/data/packed_rrset.h \ @@ -880,10 +887,11 @@ module.lo module.o: $(srcdir)/util/module.c config.h $ $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/wire2str.h netevent.lo netevent.o: $(srcdir)/util/netevent.c config.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ - $(srcdir)/testcode/checklocks.h $(srcdir)/util/ub_event.h $(srcdir)/util/net_help.h $(srcdir)/util/fptr_wlist.h \ - $(srcdir)/util/storage/lruhash.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ - $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \ + $(srcdir)/testcode/checklocks.h $(srcdir)/util/ub_event.h $(srcdir)/util/net_help.h \ + $(srcdir)/util/tcp_conn_limit.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \ + $(srcdir)/util/fptr_wlist.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/module.h \ + $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h \ $(srcdir)/services/modstack.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/str2wire.h $(srcdir)/dnstap/dnstap.h \ \ @@ -902,7 +910,15 @@ rbtree.lo rbtree.o: $(srcdir)/util/rbtree.c config.h $ $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \ $(srcdir)/services/modstack.h regional.lo regional.o: $(srcdir)/util/regional.c config.h $(srcdir)/util/log.h $(srcdir)/util/regional.h -rtt.lo rtt.o: $(srcdir)/util/rtt.c config.h $(srcdir)/util/rtt.h +rtt.lo rtt.o: $(srcdir)/util/rtt.c config.h $(srcdir)/util/rtt.h $(srcdir)/iterator/iterator.h \ + $(srcdir)/services/outbound_list.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/storage/lruhash.h \ + $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/testcode/checklocks.h $(srcdir)/util/data/packed_rrset.h \ + $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h +edns.lo edns.o: $(srcdir)/util/edns.c config.h $(srcdir)/util/config_file.h $(srcdir)/util/netevent.h \ + $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/testcode/checklocks.h $(srcdir)/util/regional.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h dnstree.lo dnstree.o: $(srcdir)/util/storage/dnstree.c config.h $(srcdir)/util/storage/dnstree.h \ $(srcdir)/util/rbtree.h $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ $(srcdir)/util/log.h $(srcdir)/testcode/checklocks.h $(srcdir)/util/net_help.h @@ -916,6 +932,12 @@ lruhash.lo lruhash.o: $(srcdir)/util/storage/lruhash.c $(srcdir)/services/modstack.h slabhash.lo slabhash.o: $(srcdir)/util/storage/slabhash.c config.h $(srcdir)/util/storage/slabhash.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/testcode/checklocks.h +tcp_conn_limit.lo tcp_conn_limit.o: $(srcdir)/util/tcp_conn_limit.c config.h $(srcdir)/util/regional.h \ + $(srcdir)/util/log.h $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h $(srcdir)/util/tcp_conn_limit.h \ + $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/locks.h $(srcdir)/testcode/checklocks.h \ + $(srcdir)/services/localzone.h $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h \ + $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/services/view.h $(srcdir)/sldns/str2wire.h timehist.lo timehist.o: $(srcdir)/util/timehist.c config.h $(srcdir)/util/timehist.h $(srcdir)/util/log.h tube.lo tube.o: $(srcdir)/util/tube.c config.h $(srcdir)/util/tube.h $(srcdir)/util/log.h $(srcdir)/util/net_help.h \ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ @@ -1030,7 +1052,8 @@ dns64.lo dns64.o: $(srcdir)/dns64/dns64.c config.h $(s $(srcdir)/util/storage/slabhash.h $(srcdir)/util/config_file.h $(srcdir)/util/fptr_wlist.h \ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ $(srcdir)/dnscrypt/cert.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \ - $(srcdir)/services/modstack.h $(srcdir)/util/net_help.h $(srcdir)/util/regional.h + $(srcdir)/services/modstack.h $(srcdir)/util/net_help.h $(srcdir)/util/regional.h \ + $(srcdir)/util/storage/dnstree.h $(srcdir)/util/data/dname.h $(srcdir)/sldns/str2wire.h edns-subnet.lo edns-subnet.o: $(srcdir)/edns-subnet/edns-subnet.c config.h \ $(srcdir)/edns-subnet/edns-subnet.h $(srcdir)/util/net_help.h $(srcdir)/util/log.h subnetmod.lo subnetmod.o: $(srcdir)/edns-subnet/subnetmod.c config.h $(srcdir)/edns-subnet/subnetmod.h \ @@ -1111,12 +1134,13 @@ unitmain.lo unitmain.o: $(srcdir)/testcode/unitmain.c $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h \ $(srcdir)/util/log.h $(srcdir)/testcode/unitmain.h $(srcdir)/util/alloc.h $(srcdir)/util/locks.h \ $(srcdir)/testcode/checklocks.h $(srcdir)/util/net_help.h $(srcdir)/util/config_file.h $(srcdir)/util/rtt.h \ - $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/services/cache/infra.h \ - $(srcdir)/util/storage/lruhash.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \ + $(srcdir)/util/timehist.h $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h \ + $(srcdir)/util/data/msgreply.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/data/packed_rrset.h \ + $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/libunbound/unbound.h \ + $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/dnscrypt/cert.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ - $(srcdir)/util/random.h $(srcdir)/respip/respip.h $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/sldns/pkthdr.h $(srcdir)/services/localzone.h $(srcdir)/services/view.h + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/random.h $(srcdir)/respip/respip.h $(srcdir)/services/localzone.h \ + $(srcdir)/services/view.h unitmsgparse.lo unitmsgparse.o: $(srcdir)/testcode/unitmsgparse.c config.h $(srcdir)/util/log.h \ $(srcdir)/testcode/unitmain.h $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h \ $(srcdir)/util/locks.h $(srcdir)/testcode/checklocks.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \ @@ -1194,10 +1218,10 @@ daemon.lo daemon.o: $(srcdir)/daemon/daemon.c config.h $(srcdir)/daemon/remote.h \ $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/services/view.h \ $(srcdir)/util/config_file.h $(srcdir)/util/shm_side/shm_main.h $(srcdir)/util/storage/lookup3.h \ - $(srcdir)/util/storage/slabhash.h $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/rrset.h \ - $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h $(srcdir)/services/localzone.h \ - $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h $(srcdir)/util/random.h $(srcdir)/util/tube.h \ - $(srcdir)/util/net_help.h $(srcdir)/sldns/keyraw.h $(srcdir)/respip/respip.h + $(srcdir)/util/storage/slabhash.h $(srcdir)/util/tcp_conn_limit.h $(srcdir)/services/listen_dnsport.h \ + $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \ + $(srcdir)/services/localzone.h $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h $(srcdir)/util/random.h \ + $(srcdir)/util/tube.h $(srcdir)/util/net_help.h $(srcdir)/sldns/keyraw.h $(srcdir)/respip/respip.h remote.lo remote.o: $(srcdir)/daemon/remote.c config.h \ $(srcdir)/daemon/remote.h \ $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \ @@ -1256,10 +1280,10 @@ worker.lo worker.o: $(srcdir)/daemon/worker.c config.h $(srcdir)/services/outbound_list.h $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h \ $(srcdir)/util/rtt.h $(srcdir)/services/cache/dns.h $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h \ $(srcdir)/services/localzone.h $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/dname.h \ - $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h \ - $(srcdir)/validator/autotrust.h $(srcdir)/validator/val_anchor.h $(srcdir)/respip/respip.h \ - $(srcdir)/libunbound/context.h $(srcdir)/libunbound/unbound-event.h $(srcdir)/libunbound/libworker.h \ - $(srcdir)/sldns/wire2str.h $(srcdir)/util/shm_side/shm_main.h + $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h $(srcdir)/util/edns.h $(srcdir)/iterator/iter_fwd.h \ + $(srcdir)/iterator/iter_hints.h $(srcdir)/validator/autotrust.h $(srcdir)/validator/val_anchor.h \ + $(srcdir)/respip/respip.h $(srcdir)/libunbound/context.h $(srcdir)/libunbound/unbound-event.h \ + $(srcdir)/libunbound/libworker.h $(srcdir)/sldns/wire2str.h $(srcdir)/util/shm_side/shm_main.h testbound.lo testbound.o: $(srcdir)/testcode/testbound.c config.h $(srcdir)/testcode/testpkts.h \ $(srcdir)/testcode/replay.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ @@ -1290,10 +1314,10 @@ worker.lo worker.o: $(srcdir)/daemon/worker.c config.h $(srcdir)/services/outbound_list.h $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h \ $(srcdir)/util/rtt.h $(srcdir)/services/cache/dns.h $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h \ $(srcdir)/services/localzone.h $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/dname.h \ - $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h \ - $(srcdir)/validator/autotrust.h $(srcdir)/validator/val_anchor.h $(srcdir)/respip/respip.h \ - $(srcdir)/libunbound/context.h $(srcdir)/libunbound/unbound-event.h $(srcdir)/libunbound/libworker.h \ - $(srcdir)/sldns/wire2str.h $(srcdir)/util/shm_side/shm_main.h + $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h $(srcdir)/util/edns.h $(srcdir)/iterator/iter_fwd.h \ + $(srcdir)/iterator/iter_hints.h $(srcdir)/validator/autotrust.h $(srcdir)/validator/val_anchor.h \ + $(srcdir)/respip/respip.h $(srcdir)/libunbound/context.h $(srcdir)/libunbound/unbound-event.h \ + $(srcdir)/libunbound/libworker.h $(srcdir)/sldns/wire2str.h $(srcdir)/util/shm_side/shm_main.h acl_list.lo acl_list.o: $(srcdir)/daemon/acl_list.c config.h $(srcdir)/daemon/acl_list.h \ $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/services/view.h $(srcdir)/util/locks.h \ $(srcdir)/util/log.h $(srcdir)/testcode/checklocks.h $(srcdir)/util/regional.h $(srcdir)/util/config_file.h \ @@ -1311,10 +1335,10 @@ daemon.lo daemon.o: $(srcdir)/daemon/daemon.c config.h $(srcdir)/daemon/remote.h \ $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/services/view.h \ $(srcdir)/util/config_file.h $(srcdir)/util/shm_side/shm_main.h $(srcdir)/util/storage/lookup3.h \ - $(srcdir)/util/storage/slabhash.h $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/rrset.h \ - $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h $(srcdir)/services/localzone.h \ - $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h $(srcdir)/util/random.h $(srcdir)/util/tube.h \ - $(srcdir)/util/net_help.h $(srcdir)/sldns/keyraw.h $(srcdir)/respip/respip.h + $(srcdir)/util/storage/slabhash.h $(srcdir)/util/tcp_conn_limit.h $(srcdir)/services/listen_dnsport.h \ + $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \ + $(srcdir)/services/localzone.h $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h $(srcdir)/util/random.h \ + $(srcdir)/util/tube.h $(srcdir)/util/net_help.h $(srcdir)/sldns/keyraw.h $(srcdir)/respip/respip.h stats.lo stats.o: $(srcdir)/daemon/stats.c config.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ $(srcdir)/libunbound/unbound.h $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ Modified: head/contrib/unbound/cachedb/cachedb.c ============================================================================== --- head/contrib/unbound/cachedb/cachedb.c Wed Oct 10 00:20:40 2018 (r339274) +++ head/contrib/unbound/cachedb/cachedb.c Wed Oct 10 07:55:06 2018 (r339275) @@ -446,6 +446,7 @@ adjust_msg_ttl(struct dns_msg* msg, time_t adjust) msg->rep->ttl -= adjust; else msg->rep->ttl = 0; msg->rep->prefetch_ttl = PREFETCH_TTL_CALC(msg->rep->ttl); + msg->rep->serve_expired_ttl = msg->rep->ttl + SERVE_EXPIRED_TTL; for(i=0; irep->rrset_count; i++) { packed_rrset_ttl_subtract((struct packed_rrset_data*)msg-> Modified: head/contrib/unbound/config.h ============================================================================== --- head/contrib/unbound/config.h Wed Oct 10 00:20:40 2018 (r339274) +++ head/contrib/unbound/config.h Wed Oct 10 07:55:06 2018 (r339275) @@ -135,7 +135,7 @@ #define HAVE_DLFCN_H 1 /* Define to 1 if you have the `DSA_SIG_set0' function. */ -#define HAVE_DSA_SIG_SET0 1 +/* #undef HAVE_DSA_SIG_SET0 */ /* Define to 1 if you have the header file. */ /* #undef HAVE_ENDIAN_H */ @@ -177,10 +177,10 @@ /* #undef HAVE_EVP_DIGESTVERIFY */ /* Define to 1 if you have the `EVP_dss1' function. */ -/* #undef HAVE_EVP_DSS1 */ +#define HAVE_EVP_DSS1 1 /* Define to 1 if you have the `EVP_MD_CTX_new' function. */ -#define HAVE_EVP_MD_CTX_NEW 1 +/* #undef HAVE_EVP_MD_CTX_NEW */ /* Define to 1 if you have the `EVP_sha1' function. */ #define HAVE_EVP_SHA1 1 @@ -631,7 +631,7 @@ #define PACKAGE_NAME "unbound" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "unbound 1.7.3" +#define PACKAGE_STRING "unbound 1.8.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "unbound" @@ -640,7 +640,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.7.3" +#define PACKAGE_VERSION "1.8.0" /* default pidfile location */ #define PIDFILE "/var/unbound/unbound.pid" @@ -659,7 +659,7 @@ #define ROOT_CERT_FILE "/var/unbound/icannbundle.pem" /* version number for resource files */ -#define RSRC_PACKAGE_VERSION 1,7,3,0 +#define RSRC_PACKAGE_VERSION 1,8,0,0 /* Directory to chdir to */ #define RUN_DIR "/var/unbound" Modified: head/contrib/unbound/configure ============================================================================== --- head/contrib/unbound/configure Wed Oct 10 00:20:40 2018 (r339274) +++ head/contrib/unbound/configure Wed Oct 10 07:55:06 2018 (r339275) @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for unbound 1.7.3. +# Generated by GNU Autoconf 2.69 for unbound 1.8.0. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unbound' PACKAGE_TARNAME='unbound' -PACKAGE_VERSION='1.7.3' -PACKAGE_STRING='unbound 1.7.3' +PACKAGE_VERSION='1.8.0' +PACKAGE_STRING='unbound 1.8.0' PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl' PACKAGE_URL='' @@ -670,9 +670,6 @@ SYSTEMD_DAEMON_LIBS SYSTEMD_DAEMON_CFLAGS SYSTEMD_LIBS SYSTEMD_CFLAGS -PKG_CONFIG_LIBDIR -PKG_CONFIG_PATH -PKG_CONFIG staticexe PC_LIBEVENT_DEPENDENCY UNBOUND_EVENT_UNINSTALL @@ -697,6 +694,9 @@ swig SWIG_LIB SWIG PC_PY_DEPENDENCY +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH +PKG_CONFIG PY_MAJOR_VERSION PYTHON_SITE_PKG PYTHON_LDFLAGS @@ -1440,7 +1440,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures unbound 1.7.3 to adapt to many kinds of systems. +\`configure' configures unbound 1.8.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1505,7 +1505,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unbound 1.7.3:";; + short | recursive ) echo "Configuration of unbound 1.8.0:";; esac cat <<\_ACEOF @@ -1722,7 +1722,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unbound configure 1.7.3 +unbound configure 1.8.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2431,7 +2431,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by unbound $as_me 1.7.3, which was +It was created by unbound $as_me 1.8.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2781,14 +2781,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu UNBOUND_VERSION_MAJOR=1 -UNBOUND_VERSION_MINOR=7 +UNBOUND_VERSION_MINOR=8 -UNBOUND_VERSION_MICRO=3 +UNBOUND_VERSION_MICRO=0 -LIBUNBOUND_CURRENT=7 -LIBUNBOUND_REVISION=11 -LIBUNBOUND_AGE=5 +LIBUNBOUND_CURRENT=8 +LIBUNBOUND_REVISION=0 +LIBUNBOUND_AGE=0 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 # 1.0.2 had 0:14:0 @@ -2850,6 +2850,7 @@ LIBUNBOUND_AGE=5 # 1.7.1 had 7:9:5 # 1.7.2 had 7:10:5 # 1.7.3 had 7:11:5 +# 1.7.4 had 8:0:0 # changes the event callback function signature # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -6273,6 +6274,8 @@ fi + + for ac_prog in flex lex do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -6432,6 +6435,7 @@ fi rm -f conftest.l $LEX_OUTPUT_ROOT.c fi +if test "$LEX" != "" -a "$LEX" != ":"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for yylex_destroy" >&5 $as_echo_n "checking for yylex_destroy... " >&6; } @@ -6442,8 +6446,27 @@ $as_echo "#define LEX_HAS_YYLEX_DESTROY 1" >>confdefs. { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; fi +$as_echo "no" >&6; }; + LEX=":" + fi +fi +if test "$LEX" != "" -a "$LEX" != ":"; then + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lex %option" >&5 +$as_echo_n "checking for lex %option... " >&6; } + if cat <&1 | grep yy_delete_buffer >/dev/null 2>&1; then +%option nounput +%% +EOF + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; }; + LEX=":" + fi + +fi for ac_prog in 'bison -y' byacc do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -16929,9 +16952,138 @@ $as_echo "#define HAVE_PYTHON 1" >>confdefs.h CPPFLAGS="$PYTHON_CPPFLAGS" fi ub_have_python=yes - PC_PY_DEPENDENCY="python" + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi +fi + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"python\${PY_MAJOR_VERSION}\"\""; } >&5 + ($PKG_CONFIG --exists --print-errors ""python${PY_MAJOR_VERSION}"") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + PC_PY_DEPENDENCY="python${PY_MAJOR_VERSION}" +else + PC_PY_DEPENDENCY="python" +fi + + # Check for SWIG ub_have_swig=no # Check whether --enable-swig-version-check was given. @@ -18870,10 +19022,10 @@ else withval="no" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libhiredis" >&5 -$as_echo_n "checking for libhiredis... " >&6; } found_libhiredis="no" if test x_$withval = x_yes -o x_$withval != x_no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libhiredis" >&5 +$as_echo_n "checking for libhiredis... " >&6; } if test x_$withval = x_ -o x_$withval = x_yes; then withval="/usr/local /opt/local /usr/lib /usr/pkg /usr/sfw /usr" fi @@ -18959,126 +19111,6 @@ else fi have_systemd=no - - - - - - - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi - -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - PKG_CONFIG="" - fi -fi if test "x$enable_systemd" != xno; then : @@ -21045,7 +21077,7 @@ _ACEOF -version=1.7.3 +version=1.8.0 date=`date +'%b %e, %Y'` @@ -21564,7 +21596,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by unbound $as_me 1.7.3, which was +This file was extended by unbound $as_me 1.8.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21630,7 +21662,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -unbound config.status 1.7.3 +unbound config.status 1.8.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" Modified: head/contrib/unbound/configure.ac ============================================================================== --- head/contrib/unbound/configure.ac Wed Oct 10 00:20:40 2018 (r339274) +++ head/contrib/unbound/configure.ac Wed Oct 10 07:55:06 2018 (r339275) @@ -10,16 +10,16 @@ sinclude(dnscrypt/dnscrypt.m4) # must be numbers. ac_defun because of later processing m4_define([VERSION_MAJOR],[1]) -m4_define([VERSION_MINOR],[7]) -m4_define([VERSION_MICRO],[3]) +m4_define([VERSION_MINOR],[8]) +m4_define([VERSION_MICRO],[0]) AC_INIT(unbound, m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]), unbound-bugs@nlnetlabs.nl, unbound) AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR]) AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR]) AC_SUBST(UNBOUND_VERSION_MICRO, [VERSION_MICRO]) -LIBUNBOUND_CURRENT=7 -LIBUNBOUND_REVISION=11 -LIBUNBOUND_AGE=5 +LIBUNBOUND_CURRENT=8 +LIBUNBOUND_REVISION=0 +LIBUNBOUND_AGE=0 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 # 1.0.2 had 0:14:0 @@ -81,6 +81,7 @@ LIBUNBOUND_AGE=5 # 1.7.1 had 7:9:5 # 1.7.2 had 7:10:5 # 1.7.3 had 7:11:5 +# 1.7.4 had 8:0:0 # changes the event callback function signature # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -323,11 +324,30 @@ AC_DEFUN([ACX_YYLEX_DESTROY], [ if echo %% | $LEX -t 2>&1 | grep yylex_destroy >/dev/null 2>&1; then AC_DEFINE(LEX_HAS_YYLEX_DESTROY, 1, [if lex has yylex_destroy]) AC_MSG_RESULT(yes) - else AC_MSG_RESULT(no); fi + else AC_MSG_RESULT(no); + LEX=":" + fi ]) +AC_DEFUN([ACX_YYLEX_OPTION], [ + AC_MSG_CHECKING([for lex %option]) + if cat <&1 | grep yy_delete_buffer >/dev/null 2>&1; then +%option nounput +%% +EOF + AC_MSG_RESULT(yes) + else AC_MSG_RESULT(no); + LEX=":" + fi +]) + AC_PROG_LEX +if test "$LEX" != "" -a "$LEX" != ":"; then ACX_YYLEX_DESTROY +fi +if test "$LEX" != "" -a "$LEX" != ":"; then +ACX_YYLEX_OPTION +fi AC_PROG_YACC AC_CHECK_PROG(doxygen, doxygen, doxygen) AC_CHECK_TOOL(STRIP, strip) @@ -585,7 +605,10 @@ if test x_$ub_test_python != x_no; then CPPFLAGS="$PYTHON_CPPFLAGS" fi ub_have_python=yes - PC_PY_DEPENDENCY="python" + PKG_PROG_PKG_CONFIG + PKG_CHECK_EXISTS(["python${PY_MAJOR_VERSION}"], + [PC_PY_DEPENDENCY="python${PY_MAJOR_VERSION}"], + [PC_PY_DEPENDENCY="python"]) AC_SUBST(PC_PY_DEPENDENCY) # Check for SWIG @@ -1177,9 +1200,9 @@ AC_CHECK_DECLS([XML_StopParser], [], [], [AC_INCLUDES_ AC_ARG_WITH(libhiredis, AC_HELP_STRING([--with-libhiredis=path], [specify explicit path for libhiredis.]), [ ],[ withval="no" ]) -AC_MSG_CHECKING(for libhiredis) found_libhiredis="no" if test x_$withval = x_yes -o x_$withval != x_no; then + AC_MSG_CHECKING(for libhiredis) if test x_$withval = x_ -o x_$withval = x_yes; then withval="/usr/local /opt/local /usr/lib /usr/pkg /usr/sfw /usr" fi Modified: head/contrib/unbound/contrib/fastrpz.patch ============================================================================== --- head/contrib/unbound/contrib/fastrpz.patch Wed Oct 10 00:20:40 2018 (r339274) +++ head/contrib/unbound/contrib/fastrpz.patch Wed Oct 10 07:55:06 2018 (r339275) @@ -274,10 +274,10 @@ Index: unbound-1.7.0~rc1/doc/unbound.conf.5.in =================================================================== --- unbound-1.7.0~rc1.orig/doc/unbound.conf.5.in +++ unbound-1.7.0~rc1/doc/unbound.conf.5.in -@@ -1581,6 +1581,81 @@ It must be /96 or shorter. The default - .B dns64\-synthall: \fI\fR - Debug option, default no. If enabled, synthesize all AAAA records - despite the presence of actual AAAA records. +@@ -1705,6 +1705,81 @@ It must be /96 or shorter. The default + used by dns64 processing instead. Can be entered multiple times, list a + new domain for which it applies, one per line. Applies also to names + underneath the name given. +.SS "Response Policy Zone Rewriting" +.LP +Response policy zone rewriting is controlled with the Modified: head/contrib/unbound/contrib/libunbound.pc.in ============================================================================== --- head/contrib/unbound/contrib/libunbound.pc.in Wed Oct 10 00:20:40 2018 (r339274) +++ head/contrib/unbound/contrib/libunbound.pc.in Wed Oct 10 07:55:06 2018 (r339275) @@ -7,7 +7,8 @@ Name: unbound Description: Library with validating, recursive, and caching DNS resolver URL: http://www.unbound.net Version: @PACKAGE_VERSION@ -Requires: @PC_LIBEVENT_DEPENDENCY@ @PC_PY_DEPENDENCY@ +Requires: libcrypto libssl @PC_LIBEVENT_DEPENDENCY@ +Requires.private: @PC_PY_DEPENDENCY@ Libs: -L${libdir} -lunbound -lssl -lcrypto Libs.private: @SSLLIB@ @LIBS@ Cflags: -I${includedir} Modified: head/contrib/unbound/contrib/unbound.service.in ============================================================================== --- head/contrib/unbound/contrib/unbound.service.in Wed Oct 10 00:20:40 2018 (r339274) +++ head/contrib/unbound/contrib/unbound.service.in Wed Oct 10 07:55:06 2018 (r339275) @@ -1,6 +1,9 @@ [Unit] Description=Validating, recursive, and caching DNS resolver Documentation=man:unbound(8) +After=network.target +Before=network-online.target nss-lookup.target +Wants=nss-lookup.target [Install] WantedBy=multi-user.target @@ -10,7 +13,7 @@ ExecReload=/bin/kill -HUP $MAINPID ExecStart=@UNBOUND_SBIN_DIR@/unbound NotifyAccess=main Type=notify -CapabilityBoundingSet=CAP_IPC_LOCK CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID CAP_SYS_CHROOT +CapabilityBoundingSet=CAP_IPC_LOCK CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID CAP_SYS_CHROOT CAP_SYS_RESOURCE MemoryDenyWriteExecute=true NoNewPrivileges=true PrivateDevices=true @@ -21,7 +24,7 @@ ProtectKernelModules=true ProtectKernelTunables=true ProtectSystem=strict ReadWritePaths=@UNBOUND_SYSCONF_DIR@ @UNBOUND_LOCALSTATE_DIR@ /run @UNBOUND_RUN_DIR@ -RestrictAddressFamilies=AF_INET AF_UNIX +RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX RestrictRealtime=true SystemCallArchitectures=native SystemCallFilter=~@clock @cpu-emulation @debug @keyring @module mount @obsolete @resources Modified: head/contrib/unbound/daemon/cachedump.c ============================================================================== --- head/contrib/unbound/daemon/cachedump.c Wed Oct 10 00:20:40 2018 (r339274) +++ head/contrib/unbound/daemon/cachedump.c Wed Oct 10 07:55:06 2018 (r339275) @@ -653,6 +653,7 @@ load_msg(RES* ssl, sldns_buffer* buf, struct worker* w rep.qdcount = (uint16_t)qdcount; rep.ttl = (time_t)ttl; rep.prefetch_ttl = PREFETCH_TTL_CALC(rep.ttl); + rep.serve_expired_ttl = rep.ttl + SERVE_EXPIRED_TTL; rep.security = (enum sec_status)security; if(an > RR_COUNT_MAX || ns > RR_COUNT_MAX || ar > RR_COUNT_MAX) { log_warn("error too many rrsets"); Modified: head/contrib/unbound/daemon/daemon.c ============================================================================== --- head/contrib/unbound/daemon/daemon.c Wed Oct 10 00:20:40 2018 (r339274) +++ head/contrib/unbound/daemon/daemon.c Wed Oct 10 07:55:06 2018 (r339275) @@ -76,6 +76,7 @@ #include "util/shm_side/shm_main.h" #include "util/storage/lookup3.h" #include "util/storage/slabhash.h" +#include "util/tcp_conn_limit.h" #include "services/listen_dnsport.h" #include "services/cache/rrset.h" #include "services/cache/infra.h" @@ -104,10 +105,8 @@ static int sig_record_reload = 0; /** cleaner ssl memory freeup */ static void* comp_meth = NULL; #endif -#ifdef LEX_HAS_YYLEX_DESTROY /** remove buffers for parsing and init */ int ub_c_lex_destroy(void); -#endif /** used when no other sighandling happens, so we don't die * when multiple signals in quick succession are sent to us. @@ -182,15 +181,8 @@ static void signal_handling_playback(struct worker* wrk) { #ifdef SIGHUP - if(sig_record_reload) { -# ifdef HAVE_SYSTEMD - sd_notify(0, "RELOADING=1"); -# endif + if(sig_record_reload) worker_sighandler(SIGHUP, wrk); -# ifdef HAVE_SYSTEMD - sd_notify(0, "READY=1"); -# endif - } #endif if(sig_record_quit) worker_sighandler(SIGTERM, wrk); @@ -279,11 +271,20 @@ daemon_init(void) free(daemon); return NULL; } + daemon->tcl = tcl_list_create(); + if(!daemon->tcl) { + acl_list_delete(daemon->acl); + edns_known_options_delete(daemon->env); + free(daemon->env); + free(daemon); + return NULL; + } if(gettimeofday(&daemon->time_boot, NULL) < 0) log_err("gettimeofday: %s", strerror(errno)); daemon->time_last_stat = daemon->time_boot; if((daemon->env->auth_zones = auth_zones_create()) == 0) { acl_list_delete(daemon->acl); + tcl_list_delete(daemon->tcl); edns_known_options_delete(daemon->env); free(daemon->env); free(daemon); @@ -584,6 +585,8 @@ daemon_fork(struct daemon* daemon) if(!acl_list_apply_cfg(daemon->acl, daemon->cfg, daemon->views)) fatal_exit("Could not setup access control list"); + if(!tcl_list_apply_cfg(daemon->tcl, daemon->cfg)) + fatal_exit("Could not setup TCP connection limits"); if(daemon->cfg->dnscrypt) { #ifdef USE_DNSCRYPT daemon->dnscenv = dnsc_create(); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@freebsd.org Wed Oct 10 08:19:12 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2D93310CC4E5; Wed, 10 Oct 2018 08:19:12 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D663173F68; Wed, 10 Oct 2018 08:19:11 +0000 (UTC) (envelope-from des@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CCD561E4F5; Wed, 10 Oct 2018 08:19:11 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9A8JBr2076140; Wed, 10 Oct 2018 08:19:11 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9A8JBAR076139; Wed, 10 Oct 2018 08:19:11 GMT (envelope-from des@FreeBSD.org) Message-Id: <201810100819.w9A8JBAR076139@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Wed, 10 Oct 2018 08:19:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339276 - head/lib/libunbound X-SVN-Group: head X-SVN-Commit-Author: des X-SVN-Commit-Paths: head/lib/libunbound X-SVN-Commit-Revision: 339276 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.27 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: Wed, 10 Oct 2018 08:19:12 -0000 Author: des Date: Wed Oct 10 08:19:11 2018 New Revision: 339276 URL: https://svnweb.freebsd.org/changeset/base/339276 Log: Update Makefile for 1.8.0, apologies for the breakage. Approved by: re (kib) Modified: head/lib/libunbound/Makefile Modified: head/lib/libunbound/Makefile ============================================================================== --- head/lib/libunbound/Makefile Wed Oct 10 07:55:06 2018 (r339275) +++ head/lib/libunbound/Makefile Wed Oct 10 08:19:11 2018 (r339276) @@ -16,7 +16,7 @@ CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -I${.OBJDIR} SRCS= alloc.c as112.c authzone.c autotrust.c cachedb.c config_file.c \ configlexer.l configparser.y context.c dname.c dns.c dns64.c \ - dnstree.c fptr_wlist.c infra.c iter_delegpt.c iter_donotq.c \ + dnstree.c edns.c fptr_wlist.c infra.c iter_delegpt.c iter_donotq.c \ iter_fwd.c iter_hints.c iter_priv.c iter_resptype.c iter_scrub.c \ iter_utils.c iterator.c keyraw.c libunbound.c libworker.c \ listen_dnsport.c localzone.c locks.c log.c lookup3.c lruhash.c \ @@ -24,10 +24,10 @@ SRCS= alloc.c as112.c authzone.c autotrust.c cachedb.c msgreply.c net_help.c netevent.c outbound_list.c outside_network.c \ packed_rrset.c parse.c parseutil.c random.c rbtree.c redis.c \ regional.c respip.c rrdef.c rrset.c rtt.c sbuffer.c slabhash.c \ - str2wire.c timehist.c tube.c ub_event_pluggable.c val_anchor.c \ - val_kcache.c val_kentry.c val_neg.c val_nsec.c val_nsec3.c \ - val_secalgo.c val_sigcrypt.c val_utils.c validator.c view.c \ - winsock_event.c wire2str.c + str2wire.c tcp_conn_limit.c timehist.c tube.c ub_event_pluggable.c \ + val_anchor.c val_kcache.c val_kentry.c val_neg.c val_nsec.c \ + val_nsec3.c val_secalgo.c val_sigcrypt.c val_utils.c validator.c \ + view.c winsock_event.c wire2str.c WARNS?= 3 NO_WTHREAD_SAFETY= true From owner-svn-src-head@freebsd.org Wed Oct 10 08:20:15 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1DC5410CC55C; Wed, 10 Oct 2018 08:20:15 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C8463740DE; Wed, 10 Oct 2018 08:20:14 +0000 (UTC) (envelope-from des@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C34131E4FB; Wed, 10 Oct 2018 08:20:14 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9A8KEjY076251; Wed, 10 Oct 2018 08:20:14 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9A8KEi5076250; Wed, 10 Oct 2018 08:20:14 GMT (envelope-from des@FreeBSD.org) Message-Id: <201810100820.w9A8KEi5076250@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Wed, 10 Oct 2018 08:20:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339277 - head/usr.sbin/unbound X-SVN-Group: head X-SVN-Commit-Author: des X-SVN-Commit-Paths: head/usr.sbin/unbound X-SVN-Commit-Revision: 339277 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.27 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: Wed, 10 Oct 2018 08:20:15 -0000 Author: des Date: Wed Oct 10 08:20:14 2018 New Revision: 339277 URL: https://svnweb.freebsd.org/changeset/base/339277 Log: Improved substitution logic for Unbound man pages. Approved by: re (kib) Modified: head/usr.sbin/unbound/Makefile.inc Modified: head/usr.sbin/unbound/Makefile.inc ============================================================================== --- head/usr.sbin/unbound/Makefile.inc Wed Oct 10 08:19:11 2018 (r339276) +++ head/usr.sbin/unbound/Makefile.inc Wed Oct 10 08:20:14 2018 (r339277) @@ -7,8 +7,8 @@ PACKAGE= unbound .for man in ${MAN} ${man}: ${UNBOUNDDIR}/doc/${man:S/local-//} sed -E \ - -e 's/\<(fI)?unbound\>/\1local-unbound/g' \ - -e 's/\<(fI)?Unbound\>/Local-unbound/g' \ + -e 's/\<(fI)?u(nbound\>[^.])/\1local-u\2/g' \ + -e 's/\<(fI)?U(nbound\>[^.])/\1Local-u\2/g' \ -e 's/\/local-unbound/\/unbound/g' \ <${.ALLSRC} >${.TARGET} CLEANFILES += ${man} From owner-svn-src-head@freebsd.org Wed Oct 10 08:53:49 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8E0B110CD038; Wed, 10 Oct 2018 08:53:49 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 427DB75170; Wed, 10 Oct 2018 08:53:49 +0000 (UTC) (envelope-from des@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3CEFB1EB61; Wed, 10 Oct 2018 08:53:49 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9A8rnW6096224; Wed, 10 Oct 2018 08:53:49 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9A8rm1X096218; Wed, 10 Oct 2018 08:53:48 GMT (envelope-from des@FreeBSD.org) Message-Id: <201810100853.w9A8rm1X096218@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Wed, 10 Oct 2018 08:53:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339278 - in head/contrib/unbound: . contrib daemon doc iterator libunbound respip services services/cache sldns smallapp util util/data validator X-SVN-Group: head X-SVN-Commit-Author: des X-SVN-Commit-Paths: in head/contrib/unbound: . contrib daemon doc iterator libunbound respip services services/cache sldns smallapp util util/data validator X-SVN-Commit-Revision: 339278 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.27 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: Wed, 10 Oct 2018 08:53:50 -0000 Author: des Date: Wed Oct 10 08:53:47 2018 New Revision: 339278 URL: https://svnweb.freebsd.org/changeset/base/339278 Log: Upgrade to 1.8.1. Approved by: re (kib) Modified: head/contrib/unbound/config.h head/contrib/unbound/config.h.in head/contrib/unbound/configure head/contrib/unbound/configure.ac head/contrib/unbound/contrib/fastrpz.patch head/contrib/unbound/daemon/daemon.c head/contrib/unbound/daemon/remote.c head/contrib/unbound/daemon/unbound.c head/contrib/unbound/daemon/worker.c head/contrib/unbound/doc/Changelog head/contrib/unbound/doc/README head/contrib/unbound/doc/example.conf head/contrib/unbound/doc/example.conf.in head/contrib/unbound/doc/libunbound.3 head/contrib/unbound/doc/libunbound.3.in head/contrib/unbound/doc/unbound-anchor.8 head/contrib/unbound/doc/unbound-anchor.8.in head/contrib/unbound/doc/unbound-checkconf.8 head/contrib/unbound/doc/unbound-checkconf.8.in head/contrib/unbound/doc/unbound-control.8 head/contrib/unbound/doc/unbound-control.8.in head/contrib/unbound/doc/unbound-host.1 head/contrib/unbound/doc/unbound-host.1.in head/contrib/unbound/doc/unbound.8 head/contrib/unbound/doc/unbound.8.in head/contrib/unbound/doc/unbound.conf.5 head/contrib/unbound/doc/unbound.conf.5.in head/contrib/unbound/iterator/iter_scrub.c head/contrib/unbound/iterator/iterator.c head/contrib/unbound/libunbound/context.c head/contrib/unbound/libunbound/libunbound.c head/contrib/unbound/libunbound/libworker.c head/contrib/unbound/respip/respip.c head/contrib/unbound/services/authzone.c head/contrib/unbound/services/cache/infra.c head/contrib/unbound/services/outside_network.c head/contrib/unbound/sldns/sbuffer.h head/contrib/unbound/smallapp/unbound-anchor.c head/contrib/unbound/smallapp/unbound-control.c head/contrib/unbound/util/config_file.c head/contrib/unbound/util/config_file.h head/contrib/unbound/util/data/msgencode.c head/contrib/unbound/util/data/msgreply.c head/contrib/unbound/util/iana_ports.inc head/contrib/unbound/util/log.h head/contrib/unbound/validator/autotrust.c head/contrib/unbound/validator/val_nsec3.c head/contrib/unbound/validator/val_secalgo.c Directory Properties: head/contrib/unbound/ (props changed) Modified: head/contrib/unbound/config.h ============================================================================== --- head/contrib/unbound/config.h Wed Oct 10 08:20:14 2018 (r339277) +++ head/contrib/unbound/config.h Wed Oct 10 08:53:47 2018 (r339278) @@ -1,6 +1,12 @@ /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ +/* apply the noreturn attribute to a function that exits the program */ +#define ATTR_NORETURN __attribute__((__noreturn__)) + +/* apply the weak attribute to a symbol */ +#define ATTR_WEAK __attribute__((weak)) + /* Directory to chroot to */ #define CHROOT_DIR "/var/unbound" @@ -46,6 +52,9 @@ /* Whether the C compiler accepts the "format" attribute */ #define HAVE_ATTR_FORMAT 1 +/* Whether the C compiler accepts the "noreturn" attribute */ +#define HAVE_ATTR_NORETURN 1 + /* Whether the C compiler accepts the "unused" attribute */ #define HAVE_ATTR_UNUSED 1 @@ -59,7 +68,7 @@ #define HAVE_CHROOT 1 /* Define to 1 if you have the `CRYPTO_cleanup_all_ex_data' function. */ -#define HAVE_CRYPTO_CLEANUP_ALL_EX_DATA 1 +/* #undef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA */ /* Define to 1 if you have the `ctime_r' function. */ #define HAVE_CTIME_R 1 @@ -85,11 +94,11 @@ /* Define to 1 if you have the declaration of `NID_ED25519', and to 0 if you don't. */ -#define HAVE_DECL_NID_ED25519 0 +#define HAVE_DECL_NID_ED25519 1 /* Define to 1 if you have the declaration of `NID_ED448', and to 0 if you don't. */ -#define HAVE_DECL_NID_ED448 0 +#define HAVE_DECL_NID_ED448 1 /* Define to 1 if you have the declaration of `NID_secp384r1', and to 0 if you don't. */ @@ -135,7 +144,7 @@ #define HAVE_DLFCN_H 1 /* Define to 1 if you have the `DSA_SIG_set0' function. */ -/* #undef HAVE_DSA_SIG_SET0 */ +#define HAVE_DSA_SIG_SET0 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_ENDIAN_H */ @@ -150,10 +159,10 @@ #define HAVE_ENDSERVENT 1 /* Define to 1 if you have the `ERR_free_strings' function. */ -#define HAVE_ERR_FREE_STRINGS 1 +/* #undef HAVE_ERR_FREE_STRINGS */ /* Define to 1 if you have the `ERR_load_crypto_strings' function. */ -#define HAVE_ERR_LOAD_CRYPTO_STRINGS 1 +/* #undef HAVE_ERR_LOAD_CRYPTO_STRINGS */ /* Define to 1 if you have the `event_base_free' function. */ /* #undef HAVE_EVENT_BASE_FREE */ @@ -171,16 +180,16 @@ /* #undef HAVE_EVENT_H */ /* Define to 1 if you have the `EVP_cleanup' function. */ -#define HAVE_EVP_CLEANUP 1 +/* #undef HAVE_EVP_CLEANUP */ /* Define to 1 if you have the `EVP_DigestVerify' function. */ -/* #undef HAVE_EVP_DIGESTVERIFY */ +#define HAVE_EVP_DIGESTVERIFY 1 /* Define to 1 if you have the `EVP_dss1' function. */ -#define HAVE_EVP_DSS1 1 +/* #undef HAVE_EVP_DSS1 */ /* Define to 1 if you have the `EVP_MD_CTX_new' function. */ -/* #undef HAVE_EVP_MD_CTX_NEW */ +#define HAVE_EVP_MD_CTX_NEW 1 /* Define to 1 if you have the `EVP_sha1' function. */ #define HAVE_EVP_SHA1 1 @@ -200,6 +209,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_EXPAT_H 1 +/* Define to 1 if you have the `explicit_bzero' function. */ +#define HAVE_EXPLICIT_BZERO 1 + /* Define to 1 if you have the `fcntl' function. */ #define HAVE_FCNTL 1 @@ -321,7 +333,7 @@ /* #undef HAVE_NSS */ /* Define to 1 if you have the `OpenSSL_add_all_digests' function. */ -#define HAVE_OPENSSL_ADD_ALL_DIGESTS 1 +/* #undef HAVE_OPENSSL_ADD_ALL_DIGESTS */ /* Define to 1 if you have the header file. */ #define HAVE_OPENSSL_BN_H 1 @@ -345,10 +357,10 @@ #define HAVE_OPENSSL_ERR_H 1 /* Define to 1 if you have the `OPENSSL_init_crypto' function. */ -/* #undef HAVE_OPENSSL_INIT_CRYPTO */ +#define HAVE_OPENSSL_INIT_CRYPTO 1 /* Define to 1 if you have the `OPENSSL_init_ssl' function. */ -/* #undef HAVE_OPENSSL_INIT_SSL */ +#define HAVE_OPENSSL_INIT_SSL 1 /* Define to 1 if you have the header file. */ #define HAVE_OPENSSL_RAND_H 1 @@ -381,7 +393,7 @@ #define HAVE_RANDOM 1 /* Define to 1 if you have the `RAND_cleanup' function. */ -#define HAVE_RAND_CLEANUP 1 +/* #undef HAVE_RAND_CLEANUP */ /* Define to 1 if you have the `reallocarray' function. */ #define HAVE_REALLOCARRAY 1 @@ -441,13 +453,13 @@ #define HAVE_SSL /**/ /* Define to 1 if you have the `SSL_CTX_set_security_level' function. */ -/* #undef HAVE_SSL_CTX_SET_SECURITY_LEVEL */ +#define HAVE_SSL_CTX_SET_SECURITY_LEVEL 1 /* Define to 1 if you have the `SSL_get0_peername' function. */ -/* #undef HAVE_SSL_GET0_PEERNAME */ +#define HAVE_SSL_GET0_PEERNAME 1 /* Define to 1 if you have the `SSL_set1_host' function. */ -/* #undef HAVE_SSL_SET1_HOST */ +#define HAVE_SSL_SET1_HOST 1 /* Define to 1 if you have the header file. */ #define HAVE_STDARG_H 1 @@ -631,7 +643,7 @@ #define PACKAGE_NAME "unbound" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "unbound 1.8.0" +#define PACKAGE_STRING "unbound 1.8.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "unbound" @@ -640,7 +652,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.8.0" +#define PACKAGE_VERSION "1.8.1" /* default pidfile location */ #define PIDFILE "/var/unbound/unbound.pid" @@ -659,7 +671,7 @@ #define ROOT_CERT_FILE "/var/unbound/icannbundle.pem" /* version number for resource files */ -#define RSRC_PACKAGE_VERSION 1,8,0,0 +#define RSRC_PACKAGE_VERSION 1,8,1,0 /* Directory to chdir to */ #define RUN_DIR "/var/unbound" @@ -722,13 +734,13 @@ /* #undef USE_ECDSA_EVP_WORKAROUND */ /* Define this to enable ED25519 support. */ -/* #undef USE_ED25519 */ +#define USE_ED25519 1 /* Define this to enable ED448 support. */ -/* #undef USE_ED448 */ +#define USE_ED448 1 /* Define this to enable GOST support. */ -#define USE_GOST 1 +/* #undef USE_GOST */ /* Define to 1 to use ipsecmod support. */ /* #undef USE_IPSECMOD */ @@ -1145,6 +1157,11 @@ char *strsep(char **stringp, const char *delim); int isblank(int c); #endif +#ifndef HAVE_EXPLICIT_BZERO +#define explicit_bzero unbound_explicit_bzero +void explicit_bzero(void* buf, size_t len); +#endif + #if defined(HAVE_INET_NTOP) && !HAVE_DECL_INET_NTOP const char *inet_ntop(int af, const void *src, char *dst, size_t size); #endif @@ -1177,7 +1194,6 @@ void *reallocarray(void *ptr, size_t nmemb, size_t siz # endif #endif /* HAVE_LIBRESSL */ #ifndef HAVE_ARC4RANDOM -void explicit_bzero(void* buf, size_t len); int getentropy(void* buf, size_t len); uint32_t arc4random(void); void arc4random_buf(void* buf, size_t n); Modified: head/contrib/unbound/config.h.in ============================================================================== --- head/contrib/unbound/config.h.in Wed Oct 10 08:20:14 2018 (r339277) +++ head/contrib/unbound/config.h.in Wed Oct 10 08:53:47 2018 (r339278) @@ -1,5 +1,11 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* apply the noreturn attribute to a function that exits the program */ +#undef ATTR_NORETURN + +/* apply the weak attribute to a symbol */ +#undef ATTR_WEAK + /* Directory to chroot to */ #undef CHROOT_DIR @@ -45,6 +51,9 @@ /* Whether the C compiler accepts the "format" attribute */ #undef HAVE_ATTR_FORMAT +/* Whether the C compiler accepts the "noreturn" attribute */ +#undef HAVE_ATTR_NORETURN + /* Whether the C compiler accepts the "unused" attribute */ #undef HAVE_ATTR_UNUSED @@ -199,6 +208,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_EXPAT_H +/* Define to 1 if you have the `explicit_bzero' function. */ +#undef HAVE_EXPLICIT_BZERO + /* Define to 1 if you have the `fcntl' function. */ #undef HAVE_FCNTL @@ -1144,6 +1156,11 @@ char *strsep(char **stringp, const char *delim); int isblank(int c); #endif +#ifndef HAVE_EXPLICIT_BZERO +#define explicit_bzero unbound_explicit_bzero +void explicit_bzero(void* buf, size_t len); +#endif + #if defined(HAVE_INET_NTOP) && !HAVE_DECL_INET_NTOP const char *inet_ntop(int af, const void *src, char *dst, size_t size); #endif @@ -1176,7 +1193,6 @@ void *reallocarray(void *ptr, size_t nmemb, size_t siz # endif #endif /* HAVE_LIBRESSL */ #ifndef HAVE_ARC4RANDOM -void explicit_bzero(void* buf, size_t len); int getentropy(void* buf, size_t len); uint32_t arc4random(void); void arc4random_buf(void* buf, size_t n); Modified: head/contrib/unbound/configure ============================================================================== --- head/contrib/unbound/configure Wed Oct 10 08:20:14 2018 (r339277) +++ head/contrib/unbound/configure Wed Oct 10 08:53:47 2018 (r339278) @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for unbound 1.8.0. +# Generated by GNU Autoconf 2.69 for unbound 1.8.1. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unbound' PACKAGE_TARNAME='unbound' -PACKAGE_VERSION='1.8.0' -PACKAGE_STRING='unbound 1.8.0' +PACKAGE_VERSION='1.8.1' +PACKAGE_STRING='unbound 1.8.1' PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl' PACKAGE_URL='' @@ -1440,7 +1440,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures unbound 1.8.0 to adapt to many kinds of systems. +\`configure' configures unbound 1.8.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1505,7 +1505,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unbound 1.8.0:";; + short | recursive ) echo "Configuration of unbound 1.8.1:";; esac cat <<\_ACEOF @@ -1722,7 +1722,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unbound configure 1.8.0 +unbound configure 1.8.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2431,7 +2431,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by unbound $as_me 1.8.0, which was +It was created by unbound $as_me 1.8.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2783,11 +2783,11 @@ UNBOUND_VERSION_MAJOR=1 UNBOUND_VERSION_MINOR=8 -UNBOUND_VERSION_MICRO=0 +UNBOUND_VERSION_MICRO=1 LIBUNBOUND_CURRENT=8 -LIBUNBOUND_REVISION=0 +LIBUNBOUND_REVISION=1 LIBUNBOUND_AGE=0 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -2850,7 +2850,8 @@ LIBUNBOUND_AGE=0 # 1.7.1 had 7:9:5 # 1.7.2 had 7:10:5 # 1.7.3 had 7:11:5 -# 1.7.4 had 8:0:0 # changes the event callback function signature +# 1.8.0 had 8:0:0 # changes the event callback function signature +# 1.8.1 had 8:1:0 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -6265,9 +6266,57 @@ if test $ac_cv_c_weak_attribute = yes; then $as_echo "#define HAVE_ATTR_WEAK 1" >>confdefs.h + +$as_echo "#define ATTR_WEAK __attribute__((weak))" >>confdefs.h + fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler (${CC-cc}) accepts the \"noreturn\" attribute" >&5 +$as_echo_n "checking whether the C compiler (${CC-cc}) accepts the \"noreturn\" attribute... " >&6; } +if ${ac_cv_c_noreturn_attribute+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_c_noreturn_attribute=no +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +__attribute__((noreturn)) void f(int x) { printf("%d", x); } + +int +main () +{ + + f(1); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_noreturn_attribute="yes" +else + ac_cv_c_noreturn_attribute="no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_noreturn_attribute" >&5 +$as_echo "$ac_cv_c_noreturn_attribute" >&6; } +if test $ac_cv_c_noreturn_attribute = yes; then + +$as_echo "#define HAVE_ATTR_NORETURN 1" >>confdefs.h + + +$as_echo "#define ATTR_NORETURN __attribute__((__noreturn__))" >>confdefs.h + +fi + + if test "$srcdir" != "."; then CPPFLAGS="$CPPFLAGS -I$srcdir" fi @@ -20033,6 +20082,20 @@ esac fi +ac_fn_c_check_func "$LINENO" "explicit_bzero" "ac_cv_func_explicit_bzero" +if test "x$ac_cv_func_explicit_bzero" = xyes; then : + $as_echo "#define HAVE_EXPLICIT_BZERO 1" >>confdefs.h + +else + case " $LIBOBJS " in + *" explicit_bzero.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS explicit_bzero.$ac_objext" + ;; +esac + +fi + + LIBOBJ_WITHOUT_CTIMEARC4="$LIBOBJS" ac_fn_c_check_func "$LINENO" "reallocarray" "ac_cv_func_reallocarray" @@ -20080,12 +20143,6 @@ fi if test "$ac_cv_func_arc4random" = "no"; then case " $LIBOBJS " in - *" explicit_bzero.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS explicit_bzero.$ac_objext" - ;; -esac - - case " $LIBOBJS " in *" arc4_lock.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS arc4_lock.$ac_objext" ;; @@ -21077,7 +21134,7 @@ _ACEOF -version=1.8.0 +version=1.8.1 date=`date +'%b %e, %Y'` @@ -21596,7 +21653,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by unbound $as_me 1.8.0, which was +This file was extended by unbound $as_me 1.8.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21662,7 +21719,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -unbound config.status 1.8.0 +unbound config.status 1.8.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" Modified: head/contrib/unbound/configure.ac ============================================================================== --- head/contrib/unbound/configure.ac Wed Oct 10 08:20:14 2018 (r339277) +++ head/contrib/unbound/configure.ac Wed Oct 10 08:53:47 2018 (r339278) @@ -11,14 +11,14 @@ sinclude(dnscrypt/dnscrypt.m4) # must be numbers. ac_defun because of later processing m4_define([VERSION_MAJOR],[1]) m4_define([VERSION_MINOR],[8]) -m4_define([VERSION_MICRO],[0]) +m4_define([VERSION_MICRO],[1]) AC_INIT(unbound, m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]), unbound-bugs@nlnetlabs.nl, unbound) AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR]) AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR]) AC_SUBST(UNBOUND_VERSION_MICRO, [VERSION_MICRO]) LIBUNBOUND_CURRENT=8 -LIBUNBOUND_REVISION=0 +LIBUNBOUND_REVISION=1 LIBUNBOUND_AGE=0 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -81,7 +81,8 @@ LIBUNBOUND_AGE=0 # 1.7.1 had 7:9:5 # 1.7.2 had 7:10:5 # 1.7.3 had 7:11:5 -# 1.7.4 had 8:0:0 # changes the event callback function signature +# 1.8.0 had 8:0:0 # changes the event callback function signature +# 1.8.1 had 8:1:0 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -310,11 +311,36 @@ __attribute__((weak)) void f(int x) { printf("%d", x); AC_MSG_RESULT($ac_cv_c_weak_attribute) if test $ac_cv_c_weak_attribute = yes; then AC_DEFINE(HAVE_ATTR_WEAK, 1, [Whether the C compiler accepts the "weak" attribute]) + AC_DEFINE(ATTR_WEAK, [__attribute__((weak))], [apply the weak attribute to a symbol]) fi ])dnl End of CHECK_WEAK_ATTRIBUTE CHECK_WEAK_ATTRIBUTE +AC_DEFUN([CHECK_NORETURN_ATTRIBUTE], +[AC_REQUIRE([AC_PROG_CC]) +AC_MSG_CHECKING(whether the C compiler (${CC-cc}) accepts the "noreturn" attribute) +AC_CACHE_VAL(ac_cv_c_noreturn_attribute, +[ac_cv_c_noreturn_attribute=no +AC_TRY_COMPILE( +[ #include +__attribute__((noreturn)) void f(int x) { printf("%d", x); } +], [ + f(1); +], +[ac_cv_c_noreturn_attribute="yes"], +[ac_cv_c_noreturn_attribute="no"]) +]) + +AC_MSG_RESULT($ac_cv_c_noreturn_attribute) +if test $ac_cv_c_noreturn_attribute = yes; then + AC_DEFINE(HAVE_ATTR_NORETURN, 1, [Whether the C compiler accepts the "noreturn" attribute]) + AC_DEFINE(ATTR_NORETURN, [__attribute__((__noreturn__))], [apply the noreturn attribute to a function that exits the program]) +fi +])dnl End of CHECK_NORETURN_ATTRIBUTE + +CHECK_NORETURN_ATTRIBUTE + if test "$srcdir" != "."; then CPPFLAGS="$CPPFLAGS -I$srcdir" fi @@ -1396,6 +1422,7 @@ AC_REPLACE_FUNCS(strlcpy) AC_REPLACE_FUNCS(memmove) AC_REPLACE_FUNCS(gmtime_r) AC_REPLACE_FUNCS(isblank) +AC_REPLACE_FUNCS(explicit_bzero) dnl without CTIME, ARC4-functions and without reallocarray. LIBOBJ_WITHOUT_CTIMEARC4="$LIBOBJS" AC_SUBST(LIBOBJ_WITHOUT_CTIMEARC4) @@ -1404,7 +1431,6 @@ if test "$USE_NSS" = "no"; then AC_REPLACE_FUNCS(arc4random) AC_REPLACE_FUNCS(arc4random_uniform) if test "$ac_cv_func_arc4random" = "no"; then - AC_LIBOBJ(explicit_bzero) AC_LIBOBJ(arc4_lock) AC_CHECK_FUNCS([getentropy],,[ if test "$USE_WINSOCK" = 1; then @@ -1729,6 +1755,11 @@ char *strsep(char **stringp, const char *delim); int isblank(int c); #endif +#ifndef HAVE_EXPLICIT_BZERO +#define explicit_bzero unbound_explicit_bzero +void explicit_bzero(void* buf, size_t len); +#endif + #if defined(HAVE_INET_NTOP) && !HAVE_DECL_INET_NTOP const char *inet_ntop(int af, const void *src, char *dst, size_t size); #endif @@ -1761,7 +1792,6 @@ void *reallocarray(void *ptr, size_t nmemb, size_t siz # endif #endif /* HAVE_LIBRESSL */ #ifndef HAVE_ARC4RANDOM -void explicit_bzero(void* buf, size_t len); int getentropy(void* buf, size_t len); uint32_t arc4random(void); void arc4random_buf(void* buf, size_t n); Modified: head/contrib/unbound/contrib/fastrpz.patch ============================================================================== --- head/contrib/unbound/contrib/fastrpz.patch Wed Oct 10 08:20:14 2018 (r339277) +++ head/contrib/unbound/contrib/fastrpz.patch Wed Oct 10 08:53:47 2018 (r339278) @@ -1,15 +1,11 @@ Description: based on the included patch contrib/fastrpz.patch Author: fastrpz@farsightsecurity.com --- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: unboundfastrpz/Makefile.in =================================================================== -RCS file: ./RCS/Makefile.in,v -retrieving revision 1.1 -Index: unbound-1.7.0~rc1/Makefile.in -=================================================================== ---- unbound-1.7.0~rc1.orig/Makefile.in -+++ unbound-1.7.0~rc1/Makefile.in -@@ -23,6 +23,8 @@ CHECKLOCK_SRC=testcode/checklocks.c +--- unboundfastrpz/Makefile.in (revision 4923) ++++ unboundfastrpz/Makefile.in (working copy) +@@ -23,6 +23,8 @@ CHECKLOCK_OBJ=@CHECKLOCK_OBJ@ DNSTAP_SRC=@DNSTAP_SRC@ DNSTAP_OBJ=@DNSTAP_OBJ@ @@ -18,7 +14,7 @@ Index: unbound-1.7.0~rc1/Makefile.in DNSCRYPT_SRC=@DNSCRYPT_SRC@ DNSCRYPT_OBJ=@DNSCRYPT_OBJ@ WITH_PYTHONMODULE=@WITH_PYTHONMODULE@ -@@ -125,7 +127,7 @@ validator/val_sigcrypt.c validator/val_u +@@ -126,7 +128,7 @@ edns-subnet/edns-subnet.c edns-subnet/subnetmod.c \ edns-subnet/addrtree.c edns-subnet/subnet-whitelist.c \ cachedb/cachedb.c cachedb/redis.c respip/respip.c $(CHECKLOCK_SRC) \ @@ -27,16 +23,16 @@ Index: unbound-1.7.0~rc1/Makefile.in COMMON_OBJ_WITHOUT_NETCALL=dns.lo infra.lo rrset.lo dname.lo msgencode.lo \ as112.lo msgparse.lo msgreply.lo packed_rrset.lo iterator.lo iter_delegpt.lo \ iter_donotq.lo iter_fwd.lo iter_hints.lo iter_priv.lo iter_resptype.lo \ -@@ -137,7 +139,7 @@ slabhash.lo timehist.lo tube.lo winsock_ +@@ -139,7 +141,7 @@ validator.lo val_kcache.lo val_kentry.lo val_neg.lo val_nsec3.lo val_nsec.lo \ - val_secalgo.lo val_sigcrypt.lo val_utils.lo dns64.lo cachedb.lo authzone.lo\ + val_secalgo.lo val_sigcrypt.lo val_utils.lo dns64.lo cachedb.lo redis.lo authzone.lo \ $(SUBNET_OBJ) $(PYTHONMOD_OBJ) $(CHECKLOCK_OBJ) $(DNSTAP_OBJ) $(DNSCRYPT_OBJ) \ -$(IPSECMOD_OBJ) respip.lo +$(FASTRPZ_OBJ) $(IPSECMOD_OBJ) respip.lo COMMON_OBJ_WITHOUT_UB_EVENT=$(COMMON_OBJ_WITHOUT_NETCALL) netevent.lo listen_dnsport.lo \ outside_network.lo COMMON_OBJ=$(COMMON_OBJ_WITHOUT_UB_EVENT) ub_event.lo -@@ -400,6 +402,11 @@ dnscrypt.lo dnscrypt.o: $(srcdir)/dnscry +@@ -405,6 +407,11 @@ $(srcdir)/util/config_file.h $(srcdir)/util/log.h \ $(srcdir)/util/netevent.h @@ -48,11 +44,11 @@ Index: unbound-1.7.0~rc1/Makefile.in # Python Module pythonmod.lo pythonmod.o: $(srcdir)/pythonmod/pythonmod.c config.h \ pythonmod/interface.h \ -Index: unbound-1.7.0~rc1/config.h.in +Index: unboundfastrpz/config.h.in =================================================================== ---- unbound-1.7.0~rc1.orig/config.h.in -+++ unbound-1.7.0~rc1/config.h.in -@@ -1228,4 +1228,11 @@ void *unbound_stat_realloc_log(void *ptr +--- unboundfastrpz/config.h.in (revision 4923) ++++ unboundfastrpz/config.h.in (working copy) +@@ -1272,4 +1272,11 @@ /** the version of unbound-control that this software implements */ #define UNBOUND_CONTROL_VERSION 1 @@ -65,11 +61,11 @@ Index: unbound-1.7.0~rc1/config.h.in +#undef FASTRPZ_LIB_OPEN +/** turn on fastrpz response policy zones */ +#undef ENABLE_FASTRPZ -Index: unbound-1.7.0~rc1/configure.ac +Index: unboundfastrpz/configure.ac =================================================================== ---- unbound-1.7.0~rc1.orig/configure.ac -+++ unbound-1.7.0~rc1/configure.ac -@@ -6,6 +6,7 @@ sinclude(ax_pthread.m4) +--- unboundfastrpz/configure.ac (revision 4923) ++++ unboundfastrpz/configure.ac (working copy) +@@ -6,6 +6,7 @@ sinclude(acx_python.m4) sinclude(ac_pkg_swig.m4) sinclude(dnstap/dnstap.m4) @@ -77,7 +73,7 @@ Index: unbound-1.7.0~rc1/configure.ac sinclude(dnscrypt/dnscrypt.m4) # must be numbers. ac_defun because of later processing -@@ -1453,6 +1454,9 @@ case "$enable_ipsecmod" in +@@ -1565,6 +1566,9 @@ ;; esac @@ -87,11 +83,11 @@ Index: unbound-1.7.0~rc1/configure.ac AC_MSG_CHECKING([if ${MAKE:-make} supports $< with implicit rule in scope]) # on openBSD, the implicit rule make $< work. # on Solaris, it does not work ($? is changed sources, $^ lists dependencies). -Index: unbound-1.7.0~rc1/daemon/daemon.c +Index: unboundfastrpz/daemon/daemon.c =================================================================== ---- unbound-1.7.0~rc1.orig/daemon/daemon.c -+++ unbound-1.7.0~rc1/daemon/daemon.c -@@ -90,6 +90,9 @@ +--- unboundfastrpz/daemon/daemon.c (revision 4923) ++++ unboundfastrpz/daemon/daemon.c (working copy) +@@ -91,6 +91,9 @@ #include "sldns/keyraw.h" #include "respip/respip.h" #include @@ -101,7 +97,7 @@ Index: unbound-1.7.0~rc1/daemon/daemon.c #ifdef HAVE_SYSTEMD #include -@@ -461,6 +464,14 @@ daemon_create_workers(struct daemon* dae +@@ -462,6 +465,14 @@ fatal_exit("dnstap enabled in config but not built with dnstap support"); #endif } @@ -116,9 +112,9 @@ Index: unbound-1.7.0~rc1/daemon/daemon.c for(i=0; inum; i++) { if(!(daemon->workers[i] = worker_create(daemon, i, shufport+numport*i/daemon->num, -@@ -710,6 +721,9 @@ daemon_cleanup(struct daemon* daemon) - #ifdef USE_DNSCRYPT +@@ -719,6 +730,9 @@ dnsc_delete(daemon->dnscenv); + daemon->dnscenv = NULL; #endif +#ifdef ENABLE_FASTRPZ + rpz_delete(&daemon->rpz_clist, &daemon->rpz_client); @@ -126,11 +122,11 @@ Index: unbound-1.7.0~rc1/daemon/daemon.c daemon->cfg = NULL; } -Index: unbound-1.7.0~rc1/daemon/daemon.h +Index: unboundfastrpz/daemon/daemon.h =================================================================== ---- unbound-1.7.0~rc1.orig/daemon/daemon.h -+++ unbound-1.7.0~rc1/daemon/daemon.h -@@ -134,6 +134,11 @@ struct daemon { +--- unboundfastrpz/daemon/daemon.h (revision 4923) ++++ unboundfastrpz/daemon/daemon.h (working copy) +@@ -136,6 +136,11 @@ /** the dnscrypt environment */ struct dnsc_env* dnscenv; #endif @@ -142,11 +138,11 @@ Index: unbound-1.7.0~rc1/daemon/daemon.h }; /** -Index: unbound-1.7.0~rc1/daemon/worker.c +Index: unboundfastrpz/daemon/worker.c =================================================================== ---- unbound-1.7.0~rc1.orig/daemon/worker.c -+++ unbound-1.7.0~rc1/daemon/worker.c -@@ -74,6 +74,9 @@ +--- unboundfastrpz/daemon/worker.c (revision 4923) ++++ unboundfastrpz/daemon/worker.c (working copy) +@@ -75,6 +75,9 @@ #include "libunbound/context.h" #include "libunbound/libworker.h" #include "sldns/sbuffer.h" @@ -156,7 +152,7 @@ Index: unbound-1.7.0~rc1/daemon/worker.c #include "sldns/wire2str.h" #include "util/shm_side/shm_main.h" #include "dnscrypt/dnscrypt.h" -@@ -527,8 +530,27 @@ answer_norec_from_cache(struct worker* w +@@ -533,8 +536,27 @@ /* not secure */ secure = 0; break; @@ -182,9 +178,9 @@ Index: unbound-1.7.0~rc1/daemon/worker.c + } +#endif /* return this delegation from the cache */ + edns_bak = *edns; edns->edns_version = EDNS_ADVERTISED_VERSION; - edns->udp_size = EDNS_ADVERTISED_SIZE; -@@ -689,6 +711,23 @@ answer_from_cache(struct worker* worker, +@@ -702,6 +724,23 @@ secure = 0; } } else secure = 0; @@ -206,9 +202,9 @@ Index: unbound-1.7.0~rc1/daemon/worker.c + } +#endif + edns_bak = *edns; edns->edns_version = EDNS_ADVERTISED_VERSION; - edns->udp_size = EDNS_ADVERTISED_SIZE; -@@ -1291,6 +1330,15 @@ worker_handle_request(struct comm_point* +@@ -1407,6 +1446,15 @@ log_addr(VERB_ALGO, "refused nonrec (cache snoop) query from", &repinfo->addr, repinfo->addrlen); goto send_reply; @@ -224,7 +220,7 @@ Index: unbound-1.7.0~rc1/daemon/worker.c } /* If we've found a local alias, replace the qname with the alias -@@ -1339,12 +1387,21 @@ lookup_cache: +@@ -1455,12 +1503,21 @@ h = query_info_hash(lookup_qinfo, sldns_buffer_read_u16_at(c->buffer, 2)); if((e=slabhash_lookup(worker->env.msg_cache, h, lookup_qinfo, 0))) { /* answer from cache - we have acquired a readlock on it */ @@ -248,7 +244,7 @@ Index: unbound-1.7.0~rc1/daemon/worker.c /* prefetch it if the prefetch TTL expired. * Note that if there is more than one pass * its qname must be that used for cache -@@ -1398,11 +1455,19 @@ lookup_cache: +@@ -1514,11 +1571,19 @@ lock_rw_unlock(&e->lock); } if(!LDNS_RD_WIRE(sldns_buffer_begin(c->buffer))) { @@ -270,11 +266,11 @@ Index: unbound-1.7.0~rc1/daemon/worker.c goto send_reply; } verbose(VERB_ALGO, "answer norec from cache -- " -Index: unbound-1.7.0~rc1/doc/unbound.conf.5.in +Index: unboundfastrpz/doc/unbound.conf.5.in =================================================================== ---- unbound-1.7.0~rc1.orig/doc/unbound.conf.5.in -+++ unbound-1.7.0~rc1/doc/unbound.conf.5.in -@@ -1705,6 +1705,81 @@ It must be /96 or shorter. The default +--- unboundfastrpz/doc/unbound.conf.5.in (revision 4923) ++++ unboundfastrpz/doc/unbound.conf.5.in (working copy) +@@ -1728,6 +1728,81 @@ used by dns64 processing instead. Can be entered multiple times, list a new domain for which it applies, one per line. Applies also to names underneath the name given. @@ -356,10 +352,10 @@ Index: unbound-1.7.0~rc1/doc/unbound.conf.5.in .SS "DNSCrypt Options" .LP The -Index: unbound-1.7.0~rc1/fastrpz/librpz.h +Index: unboundfastrpz/fastrpz/librpz.h =================================================================== ---- /dev/null -+++ unbound-1.7.0~rc1/fastrpz/librpz.h +--- unboundfastrpz/fastrpz/librpz.h (nonexistent) ++++ unboundfastrpz/fastrpz/librpz.h (working copy) @@ -0,0 +1,957 @@ +/* + * Define the interface from a DNS resolver to the Response Policy Zone @@ -1318,11 +1314,11 @@ Index: unbound-1.7.0~rc1/fastrpz/librpz.h +#endif /* LIBRPZ_LIB_OPEN */ + +#endif /* LIBRPZ_H */ -Index: unbound-1.7.0~rc1/fastrpz/rpz.c +Index: unboundfastrpz/fastrpz/rpz.c =================================================================== ---- /dev/null -+++ unbound-1.7.0~rc1/fastrpz/rpz.c -@@ -0,0 +1,1357 @@ +--- unboundfastrpz/fastrpz/rpz.c (nonexistent) ++++ unboundfastrpz/fastrpz/rpz.c (working copy) +@@ -0,0 +1,1352 @@ +/* + * fastrpz/rpz.c - interface to the fastrpz response policy zone library + * @@ -1438,8 +1434,6 @@ Index: unbound-1.7.0~rc1/fastrpz/rpz.c +static void +log_fnc(librpz_log_level_t level, void* ATTR_UNUSED(ctx), const char* buf) +{ -+ char label_buf[sizeof("rpz ")+8]; -+ + /* Setting librpz_log_level overrides the unbound "verbose" level. */ + if(level > LIBRPZ_LOG_TRACE1 && + level <= librpz->log_level_val(LIBRPZ_LOG_INVALID)) @@ -1949,12 +1943,9 @@ Index: unbound-1.7.0~rc1/fastrpz/rpz.c + case st_ck_ns: + /* An NSDNAME or NSIP check failed for lack of cached data. */ + return false; -+#pragma clang diagnostic push -+#pragma clang diagnostic ignored "-Wunreachable-code" + default: + fatal_exit("impossible RPZ state %d in rpz_worker_cache()", + rpz->st); -+#pragma clang diagnostic pop + } + + /* Wait for a trigger. */ @@ -2680,10 +2671,10 @@ Index: unbound-1.7.0~rc1/fastrpz/rpz.c +} + +#endif /* ENABLE_FASTRPZ */ -Index: unbound-1.7.0~rc1/fastrpz/rpz.h +Index: unboundfastrpz/fastrpz/rpz.h =================================================================== ---- /dev/null -+++ unbound-1.7.0~rc1/fastrpz/rpz.h +--- unboundfastrpz/fastrpz/rpz.h (nonexistent) ++++ unboundfastrpz/fastrpz/rpz.h (working copy) @@ -0,0 +1,138 @@ +/* + * fastrpz/rpz.h - interface to the fastrpz response policy zone library @@ -2823,10 +2814,10 @@ Index: unbound-1.7.0~rc1/fastrpz/rpz.h + +#endif /* ENABLE_FASTRPZ */ +#endif /* UNBOUND_FASTRPZ_RPZ_H */ -Index: unbound-1.7.0~rc1/fastrpz/rpz.m4 +Index: unboundfastrpz/fastrpz/rpz.m4 =================================================================== ---- /dev/null -+++ unbound-1.7.0~rc1/fastrpz/rpz.m4 +--- unboundfastrpz/fastrpz/rpz.m4 (nonexistent) ++++ unboundfastrpz/fastrpz/rpz.m4 (working copy) @@ -0,0 +1,64 @@ +# fastrpz/rpz.m4 + @@ -2892,10 +2883,10 @@ Index: unbound-1.7.0~rc1/fastrpz/rpz.m4 + AC_MSG_WARN([[dlopen and librpz.so needed for fastrpz]]) + fi +]) -Index: unbound-1.7.0~rc1/iterator/iterator.c +Index: unboundfastrpz/iterator/iterator.c =================================================================== ---- unbound-1.7.0~rc1.orig/iterator/iterator.c -+++ unbound-1.7.0~rc1/iterator/iterator.c +--- unboundfastrpz/iterator/iterator.c (revision 4923) ++++ unboundfastrpz/iterator/iterator.c (working copy) @@ -68,6 +68,9 @@ #include "sldns/str2wire.h" #include "sldns/parseutil.h" @@ -2906,7 +2897,7 @@ Index: unbound-1.7.0~rc1/iterator/iterator.c int iter_init(struct module_env* env, int id) -@@ -511,6 +514,23 @@ handle_cname_response(struct module_qsta +@@ -525,6 +528,23 @@ if(ntohs(r->rk.type) == LDNS_RR_TYPE_CNAME && query_dname_compare(*mname, r->rk.dname) == 0 && !iter_find_rrset_in_prepend_answer(iq, r)) { @@ -2930,7 +2921,7 @@ Index: unbound-1.7.0~rc1/iterator/iterator.c /* Add this relevant CNAME rrset to the prepend list.*/ if(!iter_add_prepend_answer(qstate, iq, r)) return 0; -@@ -519,6 +539,9 @@ handle_cname_response(struct module_qsta +@@ -533,6 +553,9 @@ /* Other rrsets in the section are ignored. */ } @@ -2940,7 +2931,7 @@ Index: unbound-1.7.0~rc1/iterator/iterator.c /* add authority rrsets to authority prepend, for wildcarded CNAMEs */ for(i=msg->rep->an_numrrsets; irep->an_numrrsets + msg->rep->ns_numrrsets; i++) { -@@ -1148,6 +1171,7 @@ processInitRequest(struct module_qstate* +@@ -1216,6 +1239,7 @@ uint8_t* delname; size_t delnamelen; struct dns_msg* msg = NULL; @@ -2948,7 +2939,7 @@ Index: unbound-1.7.0~rc1/iterator/iterator.c log_query_info(VERB_DETAIL, "resolving", &qstate->qinfo); /* check effort */ -@@ -1223,8 +1247,7 @@ processInitRequest(struct module_qstate* +@@ -1302,8 +1326,7 @@ } if(msg) { /* handle positive cache response */ @@ -2958,7 +2949,7 @@ Index: unbound-1.7.0~rc1/iterator/iterator.c if(verbosity >= VERB_ALGO) { log_dns_msg("msg from cache lookup", &msg->qinfo, msg->rep); -@@ -1232,7 +1255,22 @@ processInitRequest(struct module_qstate* +@@ -1311,7 +1334,22 @@ (int)msg->rep->ttl, (int)msg->rep->prefetch_ttl); } @@ -2981,7 +2972,7 @@ Index: unbound-1.7.0~rc1/iterator/iterator.c if(type == RESPONSE_TYPE_CNAME) { uint8_t* sname = 0; size_t slen = 0; -@@ -2552,6 +2590,62 @@ processQueryResponse(struct module_qstat +@@ -2716,6 +2754,62 @@ sock_list_insert(&qstate->reply_origin, &qstate->reply->addr, qstate->reply->addrlen, qstate->region); @@ -3041,10 +3032,10 @@ Index: unbound-1.7.0~rc1/iterator/iterator.c + } + } +#endif - if(iq->minimisation_state != DONOT_MINIMISE_STATE) { + if(iq->minimisation_state != DONOT_MINIMISE_STATE + && !(iq->chase_flags & BIT_RD)) { if(FLAGS_GET_RCODE(iq->response->rep->flags) != - LDNS_RCODE_NOERROR) { -@@ -3273,12 +3367,44 @@ processFinished(struct module_qstate* qs +@@ -3462,6 +3556,10 @@ * but only if we did recursion. The nonrecursion referral * from cache does not need to be stored in the msg cache. */ if(!qstate->no_cache_store && qstate->query_flags&BIT_RD) { @@ -3055,6 +3046,7 @@ Index: unbound-1.7.0~rc1/iterator/iterator.c iter_dns_store(qstate->env, &qstate->qinfo, iq->response->rep, 0, qstate->prefetch_leeway, iq->dp&&iq->dp->has_parent_side_NS, +@@ -3468,6 +3566,34 @@ qstate->region, qstate->query_flags); } } @@ -3089,11 +3081,11 @@ Index: unbound-1.7.0~rc1/iterator/iterator.c qstate->return_rcode = LDNS_RCODE_NOERROR; qstate->return_msg = iq->response; return 0; -Index: unbound-1.7.0~rc1/iterator/iterator.h +Index: unboundfastrpz/iterator/iterator.h =================================================================== ---- unbound-1.7.0~rc1.orig/iterator/iterator.h -+++ unbound-1.7.0~rc1/iterator/iterator.h -@@ -383,6 +383,16 @@ struct iter_qstate { +--- unboundfastrpz/iterator/iterator.h (revision 4923) ++++ unboundfastrpz/iterator/iterator.h (working copy) +@@ -386,6 +386,16 @@ */ int minimise_count; @@ -3110,11 +3102,11 @@ Index: unbound-1.7.0~rc1/iterator/iterator.h /** * Count number of time-outs. Used to prevent resolving failures when * the QNAME minimisation QTYPE is blocked. */ -Index: unbound-1.7.0~rc1/services/cache/dns.c +Index: unboundfastrpz/services/cache/dns.c =================================================================== ---- unbound-1.7.0~rc1.orig/services/cache/dns.c -+++ unbound-1.7.0~rc1/services/cache/dns.c -@@ -876,6 +876,14 @@ dns_cache_store(struct module_env* env, +--- unboundfastrpz/services/cache/dns.c (revision 4923) ++++ unboundfastrpz/services/cache/dns.c (working copy) +@@ -928,6 +928,14 @@ struct regional* region, uint32_t flags) { struct reply_info* rep = NULL; @@ -3129,11 +3121,11 @@ Index: unbound-1.7.0~rc1/services/cache/dns.c *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@freebsd.org Wed Oct 10 08:55:03 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2ADCC10CD0F4; Wed, 10 Oct 2018 08:55:03 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id BA2CA752E7; Wed, 10 Oct 2018 08:55:02 +0000 (UTC) (envelope-from des@des.no) Received: from next.des.no (smtp.des.no [194.63.250.102]) by smtp.des.no (Postfix) with ESMTP id 296DC85D0; Wed, 10 Oct 2018 08:55:02 +0000 (UTC) Received: by next.des.no (Postfix, from userid 1001) id B750FB70A; Wed, 10 Oct 2018 10:55:02 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: src-committers@freebsd.org Cc: svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r339275 - in head/contrib/unbound: . cachedb contrib daemon dns64 doc edns-subnet ipsecmod iterator libunbound respip services services/cache sldns smallapp util util/data util/storage ... In-Reply-To: <201810100755.w9A7t6UC065668@repo.freebsd.org> ("Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav=22's?= message of "Wed, 10 Oct 2018 07:55:06 +0000 (UTC)") References: <201810100755.w9A7t6UC065668@repo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (berkeley-unix) Date: Wed, 10 Oct 2018 10:55:02 +0200 Message-ID: <86lg766v15.fsf@next.des.no> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 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: Wed, 10 Oct 2018 08:55:03 -0000 Dag-Erling Sm=C3=B8rgrav writes: > Author: des > Date: Wed Oct 10 07:55:06 2018 > New Revision: 339275 > URL: https://svnweb.freebsd.org/changeset/base/339275 > > Log: > Upgrade Unbound to 1.8.0. More to follow. >=20=20=20 > Approved by: re (kib) Unfortunately, this broke the build because I left out the libunbound Makefile and regenerated config.h in a polluted environment. Both issues should be fixed as of r339278. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From owner-svn-src-head@freebsd.org Wed Oct 10 10:34:18 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C975A10CF853; Wed, 10 Oct 2018 10:34:18 +0000 (UTC) (envelope-from mw@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 737D479B98; Wed, 10 Oct 2018 10:34:18 +0000 (UTC) (envelope-from mw@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6A7EA1FB92; Wed, 10 Oct 2018 10:34:18 +0000 (UTC) (envelope-from mw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9AAYIlD050691; Wed, 10 Oct 2018 10:34:18 GMT (envelope-from mw@FreeBSD.org) Received: (from mw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9AAYIlx050690; Wed, 10 Oct 2018 10:34:18 GMT (envelope-from mw@FreeBSD.org) Message-Id: <201810101034.w9AAYIlx050690@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mw set sender to mw@FreeBSD.org using -f From: Marcin Wojtas Date: Wed, 10 Oct 2018 10:34:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339280 - head/sys/dev/uart X-SVN-Group: head X-SVN-Commit-Author: mw X-SVN-Commit-Paths: head/sys/dev/uart X-SVN-Commit-Revision: 339280 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.27 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: Wed, 10 Oct 2018 10:34:19 -0000 Author: mw Date: Wed Oct 10 10:34:17 2018 New Revision: 339280 URL: https://svnweb.freebsd.org/changeset/base/339280 Log: Update Armada 38x UART device tree binding Recent changes in Linux updated Marvell Armada 38x UART compatible string. As a result the FreeBSD driver (uart_dev_snps) does not probe. This commit fixes the situation, however not applying any functional modification to the driver methods. Approved by: re (kib) Obtained from: Semihalf Modified: head/sys/dev/uart/uart_dev_snps.c Modified: head/sys/dev/uart/uart_dev_snps.c ============================================================================== --- head/sys/dev/uart/uart_dev_snps.c Wed Oct 10 09:25:59 2018 (r339279) +++ head/sys/dev/uart/uart_dev_snps.c Wed Oct 10 10:34:17 2018 (r339280) @@ -127,6 +127,7 @@ struct uart_class uart_snps_class = { static struct ofw_compat_data compat_data[] = { { "snps,dw-apb-uart", (uintptr_t)&uart_snps_class }, + { "marvell,armada-38x-uart", (uintptr_t)&uart_snps_class }, { NULL, (uintptr_t)NULL } }; UART_FDT_CLASS(compat_data); From owner-svn-src-head@freebsd.org Wed Oct 10 16:34:54 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 071C210B5E5A; Wed, 10 Oct 2018 16:34:54 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AED8A882B0; Wed, 10 Oct 2018 16:34:53 +0000 (UTC) (envelope-from mav@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A3C5D236CD; Wed, 10 Oct 2018 16:34:53 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9AGYrlk037001; Wed, 10 Oct 2018 16:34:53 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9AGYruH037000; Wed, 10 Oct 2018 16:34:53 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201810101634.w9AGYruH037000@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Wed, 10 Oct 2018 16:34:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339288 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: head X-SVN-Commit-Author: mav X-SVN-Commit-Paths: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Commit-Revision: 339288 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.27 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: Wed, 10 Oct 2018 16:34:54 -0000 Author: mav Date: Wed Oct 10 16:34:53 2018 New Revision: 339288 URL: https://svnweb.freebsd.org/changeset/base/339288 Log: Remove extra thread_exit() call left after r329802. spa_condense_indirect_thread() is no longer a thread function, but just a callback for new zthr KPI. Submitted by: allanjude Approved by: re (gjb) MFC after: 3 days Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_indirect.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_indirect.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_indirect.c Wed Oct 10 15:54:01 2018 (r339287) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_indirect.c Wed Oct 10 16:34:53 2018 (r339288) @@ -723,7 +723,6 @@ spa_condense_indirect_thread(void *arg, zthr_t *zthr) ZFS_SPACE_CHECK_EXTRA_RESERVED)); return (0); - thread_exit(); } /* From owner-svn-src-head@freebsd.org Wed Oct 10 17:40:59 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2D9E810B737C for ; Wed, 10 Oct 2018 17:40:59 +0000 (UTC) (envelope-from freebsd@omnilan.de) Received: from mx0.gentlemail.de (mx0.gentlemail.de [IPv6:2a00:e10:2800::a130]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A7DEA8A0E8; Wed, 10 Oct 2018 17:40:58 +0000 (UTC) (envelope-from freebsd@omnilan.de) Received: from mh0.gentlemail.de (ezra.dcm1.omnilan.net [IPv6:2a00:e10:2800::a135]) by mx0.gentlemail.de (8.14.5/8.14.5) with ESMTP id w9AHetAh051498; Wed, 10 Oct 2018 19:40:55 +0200 (CEST) (envelope-from freebsd@omnilan.de) Received: from titan.inop.mo1.omnilan.net (s1.omnilan.de [217.91.127.234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mh0.gentlemail.de (Postfix) with ESMTPSA id BE6BAF51; Wed, 10 Oct 2018 19:40:55 +0200 (CEST) Subject: Re: a word of caution about the new default of so-reuseport on FreeBSD To: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= , src-committers@freebsd.org, svn-src-head@freebsd.org References: <2f065155-52c2-1036-78da-f6b337c69541@NLnetLabs.nl> From: Harry Schmalzbauer Organization: OmniLAN Message-ID: Date: Wed, 10 Oct 2018 19:40:55 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <2f065155-52c2-1036-78da-f6b337c69541@NLnetLabs.nl> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.7 (mx0.gentlemail.de [IPv6:2a00:e10:2800::a130]); Wed, 10 Oct 2018 19:40:55 +0200 (CEST) X-Milter: Spamilter (Reciever: mx0.gentlemail.de; Sender-ip: ; Sender-helo: mh0.gentlemail.de; ) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 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: Wed, 10 Oct 2018 17:40:59 -0000 Am 10.10.2018 um 10:53 schrieb Dag-Erling Smørgrav: > Author: des > Date: Wed Oct 10 08:53:47 2018 > New Revision: 339278 > URL: https://svnweb.freebsd.org/changeset/base/339278 > > Log: > Upgrade to 1.8.1. > > Approved by: re (kib) Very much appreciated! Most likely you are aware about the "so-reuseport" topic via Unbound-users. I didn't follow the diff/issue at all, just wanted to point it out, so somebody from the experts team can decide if 1.8.1 is suitable (with the 1.8.1 defaults) for shipping... Thanks, -harry Am 08.10.2018 um 14:01 schrieb Benno Overeinder via Unbound-users: > On 21/09/2018 20:27, nusenu via Unbound-users wrote: >> When upgrading (and before restarting unbound) I explicitly set >> the new defaults in the conf file to make their value explicit. >> ( so-reuseport, harden-below-nxdomain, minimal-responses) >> >> After I upgraded and restarted unbound all queries were handled by only a single thread >> even though I have multiple threads enabled in the config, as a result of that the number of >> queries in the queue skyrocketed. >> >> I expected this to be related to so-reuseport and after setting that to 'no', >> things were back to normal (all threads handled queries again, queue size back to normal). > Thank you for bringing this to our attention. so-reuseport behaves > indeed different for Linux and FreeBSD. We will schedule a different > default so-reuseport config setting for FreeBSD in Unbound 1.8.2. (It > will not appear in 1.8.1 which will released this week.) > > Best regards, > > -- Benno From owner-svn-src-head@freebsd.org Wed Oct 10 17:48:54 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5F8F110B76B6 for ; Wed, 10 Oct 2018 17:48:54 +0000 (UTC) (envelope-from sbruno@freebsd.org) Received: from mail.ignoranthack.me (ignoranthack.me [199.102.79.106]) (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 494A18A746; Wed, 10 Oct 2018 17:48:51 +0000 (UTC) (envelope-from sbruno@freebsd.org) Received: from [192.168.0.6] (97-123-22-185.albq.qwest.net [97.123.22.185]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sbruno@ignoranthack.me) by mail.ignoranthack.me (Postfix) with ESMTPSA id 2E32A1AFBDA; Wed, 10 Oct 2018 09:51:12 +0000 (UTC) Subject: Re: a word of caution about the new default of so-reuseport on FreeBSD To: Harry Schmalzbauer , =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= , src-committers@freebsd.org, svn-src-head@freebsd.org References: <2f065155-52c2-1036-78da-f6b337c69541@NLnetLabs.nl> Cc: jlundberg@llnw.com From: Sean Bruno Openpgp: preference=signencrypt Autocrypt: addr=sbruno@freebsd.org; prefer-encrypt=mutual; keydata= xsBNBFk+0UEBCADaf4bgxxKvMOhRV5NPoGWRCCGm49d6+1VFNlQ77WsY/+Zvf95TPULdRlnG w648KfxWt7+O3kdKhdRwnqlXWC7zA2Qt0dRE1yIqOGJ4jp4INvp/bcxWzgr0aoKOjrlnfxRV bh+s0rzdZt6TsNL3cVYxkC8oezjaUkHdW4mFJU249U1QJogkF8g0FeKNfEcjEkwJNX6lQJH+ EzCWT0NCk6J+Xyo+zOOljxPp1OUfdvZi3ulkU/qTZstGVWxFVsP8xQklV/y3AFcbIYx6iGJ4 5L7WuB0IWhO7Z4yHENr8wFaNYwpod9i4egX2BugbrM8pOfhN2/qqdeG1L5LMtXw3yyAhABEB AAHNN1NlYW4gQnJ1bm8gKEZyZWVCU0QgRGV2ZWxvcGVyIEtleSkgPHNicnVub0BmcmVlYnNk Lm9yZz7CwJQEEwEKAD4WIQToxOn4gDUE4eP0ujS95PX+ibX8tgUCWT7RQQIbAwUJBaOagAUL CQgHAwUVCgkICwUWAwIBAAIeAQIXgAAKCRC95PX+ibX8ttKTCACFKzRc56EBAlVotq02EjZP SfX+unlk6AuPBzShxqRxeK+bGYVCigrYd1M8nnskv0dEiZ5iYeND9HIxbpEyopqgpVTibA7w gBXaZ7SOEhNX1wXwg14JrralfSmPFMYni+sWegPMX/zwfAsn1z4mG1Nn44Xqo3o7CfpkMPy6 M5Bow2IDzIhEYISLR+urxs74/aHU35PLtBSDtu18914SEMDdva27MARN8mbeCDbuJVfGCPWy YHuy2t+9u2Zn5Dd+t3sBXLM9gpeaMm+4x6TNPpESygbVdh4tDdjVZ9DK/bWFg0kMgfZoaq6J l0jNsQXrZV3bzYNFbVw04pFcvA2GIJ7xzsBNBFk+0UEBCADIXBmQOaKMHGbc9vwjhV4Oj5aZ DdhNedn12FVeTdOXJvuTOusgxS29lla0RenHGDsgD08UiFpasBXWq/E+BhQ19d+iRbLLR17O KKc1ZGefoVbLARLXD68J5j4XAyK+6k2KqBLlqzAEpHTzsksM9naARkVXiEVcrt6ciw0FSm8n kuK3gDKKe93XfzfP+TQdbvvzJc7Fa+appLbXz61TM1aikaQlda8bWubDegwXbuoJdB34xU1m yjr/N4o+raL0x7QrzdH+wwgrTTo+H4S2c1972Skt5K5tbxLowfHicRl23V8itVQr3sBtlX4+ 66q+Apm7+R36bUS/k+G45Sp6iPpxABEBAAHCwHwEGAEKACYWIQToxOn4gDUE4eP0ujS95PX+ ibX8tgUCWT7RQQIbDAUJBaOagAAKCRC95PX+ibX8trrIB/9Pljqt/JGamD9tx4dOVmxSyFg9 z2xzgklTLuDgS73MM120mM7ao9AQUeWiSle/H0UCK7xPOzC/aeUC4oygDQKAfkkNbCNTo3+A qDjBRA8qx0e9a/QjDL+RFgD4L5kLT4tToY8T8HaBp8h03LBfk510IaI8oL/Jg7vpM3PDtJMW tUi2H+yNFmL3NfM2oBToWKLFsoP54f/eeeImrNnrlLjLHPzqS+/9apgYqX2Jwiv3tHBc4FTO GuY8VvF7BpixJs8Pc2RUuCfSyodrp1YG1kRGlXAH0cqwwr0Zmk4+7dZvtVQMCl6kS6q1+84q JwtItxS2eXSEA4NO0sQ3BXUywANh Message-ID: <3ba1449b-c078-3375-3dc8-caba564fd387@freebsd.org> Date: Wed, 10 Oct 2018 11:48:40 -0600 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:60.0) Gecko/20100101 Thunderbird/60.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="2yGwmFzfHebnLhUcyqB3X9ZCxBRzl4jsg" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 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: Wed, 10 Oct 2018 17:48:54 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --2yGwmFzfHebnLhUcyqB3X9ZCxBRzl4jsg Content-Type: multipart/mixed; boundary="OZ2oy2wOqPuMcY8gN64PCFNvaDLkaV9mb"; protected-headers="v1" From: Sean Bruno To: Harry Schmalzbauer , =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= , src-committers@freebsd.org, svn-src-head@freebsd.org Cc: jlundberg@llnw.com Message-ID: <3ba1449b-c078-3375-3dc8-caba564fd387@freebsd.org> Subject: Re: a word of caution about the new default of so-reuseport on FreeBSD References: <2f065155-52c2-1036-78da-f6b337c69541@NLnetLabs.nl> In-Reply-To: --OZ2oy2wOqPuMcY8gN64PCFNvaDLkaV9mb Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 10/10/18 11:40 AM, Harry Schmalzbauer wrote: > Am 10.10.2018 um 10:53 schrieb Dag-Erling Sm=C3=B8rgrav: >> Author: des >> Date: Wed Oct 10 08:53:47 2018 >> New Revision: 339278 >> URL: https://svnweb.freebsd.org/changeset/base/339278 >> >> Log: >> =C2=A0=C2=A0 Upgrade to 1.8.1. >> =C2=A0=C2=A0 =C2=A0=C2=A0 Approved by:=C2=A0=C2=A0=C2=A0 re (kib) >=20 > Very much appreciated! > Most likely you are aware about the "so-reuseport" topic via Unbound-us= ers. > I didn't follow the diff/issue at all, just wanted to point it out, so > somebody from the experts team can decide if 1.8.1 is suitable (with th= e > 1.8.1 defaults) for shipping... >=20 > Thanks, > -harry >=20 > Am 08.10.2018 um 14:01 schrieb Benno Overeinder via Unbound-users: >> On 21/09/2018 20:27, nusenu via Unbound-users wrote: >>> When upgrading (and before restarting unbound) I explicitly set >>> the new defaults in the conf file to make their value explicit. >>> ( so-reuseport, harden-below-nxdomain, minimal-responses) >>> >>> After I upgraded and restarted unbound all queries were handled by >>> only a single thread >>> even though I have multiple threads enabled in the config, as a >>> result of that the number of >>> queries in the queue skyrocketed. >>> >>> I expected this to be related to so-reuseport and after setting that >>> to 'no', >>> things were back to normal (all threads handled queries again, queue >>> size back to normal). >> Thank you for bringing this to our attention.=C2=A0 so-reuseport behav= es >> indeed different for Linux and FreeBSD.=C2=A0 We will schedule a diffe= rent >> default so-reuseport config setting for FreeBSD in Unbound 1.8.2.=C2=A0= (It >> will not appear in 1.8.1 which will released this week.) >> >> Best regards, >> >> -- Benno >=20 >=20 I didn't see Johnnes on this thread, so I'm tagging him in the CC. sean --OZ2oy2wOqPuMcY8gN64PCFNvaDLkaV9mb-- --2yGwmFzfHebnLhUcyqB3X9ZCxBRzl4jsg Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE6MTp+IA1BOHj9Lo0veT1/om1/LYFAlu+O3pfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEU4 QzRFOUY4ODAzNTA0RTFFM0Y0QkEzNEJERTRGNUZFODlCNUZDQjYACgkQveT1/om1 /LYMzwgAjXZUOBbWAjJNVeRFNtkvoqOf+KCGpSgxyBPLVdycTZBuaaehre30ss8+ un/KlBRIvegcpwwiSGcY5KdFcYA/c/heKOqFoNlHvKLXmf5HBuv4F2qhgJddN0wY 4AbwaVZqMHufhmesXGdBdgUrE9PHKGbtPq5deZwG8Nk7Lz1HaX9M66pkSfJeUcRN sVb7Oxydh1ldYGXc2tyxmxnAipn/O7/fYgy1gPk5a+FQPZJuLO4YvhZaqIM+enac DshG4BAMW+wnuqxroCPyV65eQsuy3d1upPNaBrCLT135ciko52MEonqB+vXP8pz/ Y5oe907W9H+jsHBPeY/KFW4aXH+16g== =RBSQ -----END PGP SIGNATURE----- --2yGwmFzfHebnLhUcyqB3X9ZCxBRzl4jsg-- From owner-svn-src-head@freebsd.org Wed Oct 10 19:39:48 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5154010BA1F1; Wed, 10 Oct 2018 19:39:48 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DE7A18EE7E; Wed, 10 Oct 2018 19:39:47 +0000 (UTC) (envelope-from allanjude@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D296D2558F; Wed, 10 Oct 2018 19:39:47 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9AJdl7D032310; Wed, 10 Oct 2018 19:39:47 GMT (envelope-from allanjude@FreeBSD.org) Received: (from allanjude@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9AJdldw032309; Wed, 10 Oct 2018 19:39:47 GMT (envelope-from allanjude@FreeBSD.org) Message-Id: <201810101939.w9AJdldw032309@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: allanjude set sender to allanjude@FreeBSD.org using -f From: Allan Jude Date: Wed, 10 Oct 2018 19:39:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339289 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: head X-SVN-Commit-Author: allanjude X-SVN-Commit-Paths: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Commit-Revision: 339289 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.27 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: Wed, 10 Oct 2018 19:39:48 -0000 Author: allanjude Date: Wed Oct 10 19:39:47 2018 New Revision: 339289 URL: https://svnweb.freebsd.org/changeset/base/339289 Log: Resolve a hang in ZFS during vnode reclaimation This is caused by a deadlock between zil_commit() and zfs_zget() Add a way for zfs_zget() to break out of the retry loop in the common case PR: 229614 Reported by: grembo, Andreas Sommer, many others Tested by: Andreas Sommer, Vicki Pfau Reviewed by: avg (no objection) Approved by: re (gjb) MFC after: 2 months Sponsored by: Klara Systems Differential Revision: https://reviews.freebsd.org/D17460 Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Wed Oct 10 16:34:53 2018 (r339288) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Wed Oct 10 19:39:47 2018 (r339289) @@ -1165,15 +1165,27 @@ again: */ ASSERT3P(zp, !=, NULL); ASSERT3U(zp->z_id, ==, obj_num); - *zpp = zp; - vp = ZTOV(zp); + if (zp->z_unlinked) { + err = SET_ERROR(ENOENT); + } else { + vp = ZTOV(zp); + /* + * Don't let the vnode disappear after + * ZFS_OBJ_HOLD_EXIT. + */ + VN_HOLD(vp); + *zpp = zp; + err = 0; + } - /* Don't let the vnode disappear after ZFS_OBJ_HOLD_EXIT. */ - VN_HOLD(vp); - sa_buf_rele(db, NULL); ZFS_OBJ_HOLD_EXIT(zfsvfs, obj_num); + if (err) { + getnewvnode_drop_reserve(); + return (err); + } + locked = VOP_ISLOCKED(vp); VI_LOCK(vp); if ((vp->v_iflag & VI_DOOMED) != 0 && @@ -1206,7 +1218,7 @@ again: } VI_UNLOCK(vp); getnewvnode_drop_reserve(); - return (0); + return (err); } /* From owner-svn-src-head@freebsd.org Wed Oct 10 19:57:11 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3712810BA96E; Wed, 10 Oct 2018 19:57:11 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E15988FA43; Wed, 10 Oct 2018 19:57:10 +0000 (UTC) (envelope-from gjb@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D82CA258CF; Wed, 10 Oct 2018 19:57:10 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9AJvA5t042226; Wed, 10 Oct 2018 19:57:10 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9AJvAB7042225; Wed, 10 Oct 2018 19:57:10 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201810101957.w9AJvAB7042225@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 10 Oct 2018 19:57:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339290 - head/release/scripts X-SVN-Group: head X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: head/release/scripts X-SVN-Commit-Revision: 339290 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.27 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: Wed, 10 Oct 2018 19:57:11 -0000 Author: gjb Date: Wed Oct 10 19:57:10 2018 New Revision: 339290 URL: https://svnweb.freebsd.org/changeset/base/339290 Log: Add graphics/drm-legacy-kmod and graphics/drm-stable-kmod to the list of packages to include on the dvd installer. Approved by: re (marius, rgrimes) Sponsored by: The FreeBSD Foundation Modified: head/release/scripts/pkg-stage.sh Modified: head/release/scripts/pkg-stage.sh ============================================================================== --- head/release/scripts/pkg-stage.sh Wed Oct 10 19:39:47 2018 (r339289) +++ head/release/scripts/pkg-stage.sh Wed Oct 10 19:57:10 2018 (r339290) @@ -16,6 +16,8 @@ _DVD_PACKAGES="archivers/unzip devel/subversion devel/subversion-static emulators/linux_base-c6 +graphics/drm-legacy-kmod +graphics/drm-stable-kmod misc/freebsd-doc-all net/mpd5 net/rsync From owner-svn-src-head@freebsd.org Wed Oct 10 20:25:42 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 85AD010BB151; Wed, 10 Oct 2018 20:25:42 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2B51670762; Wed, 10 Oct 2018 20:25:42 +0000 (UTC) (envelope-from gjb@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 177F225DB4; Wed, 10 Oct 2018 20:25:42 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9AKPfIa057512; Wed, 10 Oct 2018 20:25:41 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9AKPfcZ057511; Wed, 10 Oct 2018 20:25:41 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201810102025.w9AKPfcZ057511@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 10 Oct 2018 20:25:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339292 - head/stand/defaults X-SVN-Group: head X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: head/stand/defaults X-SVN-Commit-Revision: 339292 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.27 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: Wed, 10 Oct 2018 20:25:42 -0000 Author: gjb Date: Wed Oct 10 20:25:41 2018 New Revision: 339292 URL: https://svnweb.freebsd.org/changeset/base/339292 Log: Fix a minor typo in loader.conf(5). Approved by: re (kib) Sponsored by: The FreeBSD Foundation Modified: head/stand/defaults/loader.conf.5 Modified: head/stand/defaults/loader.conf.5 ============================================================================== --- head/stand/defaults/loader.conf.5 Wed Oct 10 20:21:09 2018 (r339291) +++ head/stand/defaults/loader.conf.5 Wed Oct 10 20:25:41 2018 (r339292) @@ -155,7 +155,7 @@ directive, but they may be loaded directly at the .Xr loader 8 prompt. Blacklisted modules may still be loaded indirectly as dependencies of other -moduled. +modules. .It Ar *_load If set to .Dq YES , From owner-svn-src-head@freebsd.org Wed Oct 10 20:26:02 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D342E10BB193 for ; Wed, 10 Oct 2018 20:26:02 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id 748687088A; Wed, 10 Oct 2018 20:26:02 +0000 (UTC) (envelope-from des@des.no) Received: from next.des.no (smtp.des.no [194.63.250.102]) by smtp.des.no (Postfix) with ESMTP id 50AEC81AD; Wed, 10 Oct 2018 20:26:01 +0000 (UTC) Received: by next.des.no (Postfix, from userid 1001) id 42775B711; Wed, 10 Oct 2018 22:26:01 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Harry Schmalzbauer Cc: src-committers@freebsd.org, svn-src-head@freebsd.org Subject: Re: a word of caution about the new default of so-reuseport on FreeBSD In-Reply-To: (Harry Schmalzbauer's message of "Wed, 10 Oct 2018 19:40:55 +0200") References: <2f065155-52c2-1036-78da-f6b337c69541@NLnetLabs.nl> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (berkeley-unix) Date: Wed, 10 Oct 2018 22:26:01 +0200 Message-ID: <86a7nl7dly.fsf@next.des.no> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 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: Wed, 10 Oct 2018 20:26:03 -0000 Harry Schmalzbauer writes: > Most likely you are aware about the "so-reuseport" topic via Unbound-user= s. > I didn't follow the diff/issue at all, just wanted to point it out, so > somebody from the experts team can decide if 1.8.1 is suitable (with > the 1.8.1 defaults) for shipping... I'll apply the upstream patch (r4932) before the release. Right now I need to focus on DNS-over-TLS support. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From owner-svn-src-head@freebsd.org Wed Oct 10 22:29:07 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 37FDA10BE9D4; Wed, 10 Oct 2018 22:29:07 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E1C9C74BB8; Wed, 10 Oct 2018 22:29:06 +0000 (UTC) (envelope-from des@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D880B2716D; Wed, 10 Oct 2018 22:29:06 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9AMT6gC020324; Wed, 10 Oct 2018 22:29:06 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9AMT6Fx020320; Wed, 10 Oct 2018 22:29:06 GMT (envelope-from des@FreeBSD.org) Message-Id: <201810102229.w9AMT6Fx020320@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Wed, 10 Oct 2018 22:29:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339294 - in head: contrib/ldns contrib/unbound crypto/openssh X-SVN-Group: head X-SVN-Commit-Author: des X-SVN-Commit-Paths: in head: contrib/ldns contrib/unbound crypto/openssh X-SVN-Commit-Revision: 339294 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.27 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: Wed, 10 Oct 2018 22:29:07 -0000 Author: des Date: Wed Oct 10 22:29:06 2018 New Revision: 339294 URL: https://svnweb.freebsd.org/changeset/base/339294 Log: Try harder to sanitize the environment before running configure. Remove a workaround for older Unbound versions that used sbrk. Approved by: re (gjb) Modified: head/contrib/ldns/freebsd-configure.sh head/contrib/unbound/freebsd-configure.sh head/crypto/openssh/freebsd-configure.sh Modified: head/contrib/ldns/freebsd-configure.sh ============================================================================== --- head/contrib/ldns/freebsd-configure.sh Wed Oct 10 21:28:04 2018 (r339293) +++ head/contrib/ldns/freebsd-configure.sh Wed Oct 10 22:29:06 2018 (r339294) @@ -5,15 +5,26 @@ set -e +error() { + echo "$@" >&2 + exit 1 +} + ldns=$(dirname $(realpath $0)) cd $ldns -libtoolize --copy -autoheader -autoconf +# Run autotools before we drop LOCALBASE out of PATH +(cd $ldns && libtoolize --copy && autoheader && autoconf) +(cd $ldns/drill && aclocal && autoheader && autoconf) + +# Ensure we use the correct toolchain and clean our environment +export CC=$(echo ".include " | make -f /dev/stdin -VCC) +export CPP=$(echo ".include " | make -f /dev/stdin -VCPP) +unset CFLAGS CPPFLAGS LDFLAGS LD_LIBRARY_PATH LIBS +export PATH=/bin:/sbin:/usr/bin:/usr/sbin + +cd $ldns ./configure --prefix= --exec-prefix=/usr --disable-dane-ta-usage cd $ldns/drill -autoheader -autoconf ./configure --prefix= --exec-prefix=/usr Modified: head/contrib/unbound/freebsd-configure.sh ============================================================================== --- head/contrib/unbound/freebsd-configure.sh Wed Oct 10 21:28:04 2018 (r339293) +++ head/contrib/unbound/freebsd-configure.sh Wed Oct 10 22:29:06 2018 (r339294) @@ -13,6 +13,15 @@ error() { unbound=$(dirname $(realpath $0)) cd $unbound +# Run autotools before we drop LOCALBASE out of PATH +(cd $unbound && libtoolize --copy && autoheader && autoconf) + +# Ensure we use the correct toolchain and clean our environment +export CC=$(echo ".include " | make -f /dev/stdin -VCC) +export CPP=$(echo ".include " | make -f /dev/stdin -VCPP) +unset CFLAGS CPPFLAGS LDFLAGS LD_LIBRARY_PATH LIBS +export PATH=/bin:/sbin:/usr/bin:/usr/sbin + ldnssrc=$(realpath $unbound/../ldns) [ -f $ldnssrc/ldns/ldns.h ] || error "can't find LDNS sources" export CFLAGS="-I$ldnssrc" @@ -24,17 +33,9 @@ ldnsobj=$(realpath $(make -C$ldnsbld -V.OBJDIR)) [ -f $ldnsobj/libprivateldns.a ] || error "can't find LDNS object directory" export LDFLAGS="-L$ldnsobj" -export CC=$(echo ".include " | make -f /dev/stdin -VCC) -export CPP=$(echo ".include " | make -f /dev/stdin -VCPP) - -autoconf -autoheader +cd $unbound ./configure \ --prefix= --exec-prefix=/usr \ --with-conf-file=/var/unbound/unbound.conf \ --with-run-dir=/var/unbound \ --with-username=unbound - -# Don't try to provide bogus memory usage statistics based on sbrk(2). -sed -n -i.orig -e '/HAVE_SBRK/!p' config.status -./config.status config.h Modified: head/crypto/openssh/freebsd-configure.sh ============================================================================== --- head/crypto/openssh/freebsd-configure.sh Wed Oct 10 21:28:04 2018 (r339293) +++ head/crypto/openssh/freebsd-configure.sh Wed Oct 10 22:29:06 2018 (r339294) @@ -16,28 +16,27 @@ configure_args=" set -e -# make sure configure uses the correct compiler -export CC=$(echo ".include " | make -f /dev/stdin -VCC) -export CPP=$(echo ".include " | make -f /dev/stdin -VCPP) -unset CFLAGS CPPFLAGS LDFLAGS LIBS +openssh=$(dirname $(realpath $0)) +cd $openssh -# regenerate configure and config.h.in -autoheader -autoconf +# Run autotools before we drop LOCALBASE out of PATH +(cd $openssh && libtoolize --copy && autoheader && autoconf) -# reset PATH to avoid picking up the wrong libraries +# Ensure we use the correct toolchain and clean our environment +export CC=$(echo ".include " | make -f /dev/stdin -VCC) +export CPP=$(echo ".include " | make -f /dev/stdin -VCPP) +unset CFLAGS CPPFLAGS LDFLAGS LD_LIBRARY_PATH LIBS export PATH=/bin:/sbin:/usr/bin:/usr/sbin -unset LD_LIBRARY_PATH -# generate config.h with krb5 and stash it +# Generate config.h with krb5 and stash it sh configure $configure_args --with-kerberos5=/usr mv config.log config.log.orig mv config.h config.h.orig -# generate config.h without krb5 +# Generate config.h without krb5 sh configure $configure_args --without-kerberos5 -# extract the difference +# Extract the difference echo '/* $Free''BSD$ */' > krb5_config.h diff -u config.h.orig config.h | sed -n '/^-#define/s/^-//p' | From owner-svn-src-head@freebsd.org Wed Oct 10 22:55:32 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 07B7C10BF48D; Wed, 10 Oct 2018 22:55:31 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8B10E75DE7; Wed, 10 Oct 2018 22:55:31 +0000 (UTC) (envelope-from allanjude@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 805E62765B; Wed, 10 Oct 2018 22:55:31 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9AMtV14035580; Wed, 10 Oct 2018 22:55:31 GMT (envelope-from allanjude@FreeBSD.org) Received: (from allanjude@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9AMtVaP035579; Wed, 10 Oct 2018 22:55:31 GMT (envelope-from allanjude@FreeBSD.org) Message-Id: <201810102255.w9AMtVaP035579@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: allanjude set sender to allanjude@FreeBSD.org using -f From: Allan Jude Date: Wed, 10 Oct 2018 22:55:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339298 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: head X-SVN-Commit-Author: allanjude X-SVN-Commit-Paths: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Commit-Revision: 339298 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.27 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: Wed, 10 Oct 2018 22:55:32 -0000 Author: allanjude Date: Wed Oct 10 22:55:31 2018 New Revision: 339298 URL: https://svnweb.freebsd.org/changeset/base/339298 Log: Add missing sysctls for tuning vdev queue depths for new I/O types This connects new tunables that were added but not exposed in: r329502 (zpool remove) r337007 (zpool initialize) Reviewed by: avg Approved by: re (kib) MFC after: 2 weeks Sponsored by: Klara Systems Differential Revision: https://reviews.freebsd.org/D17494 Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c Wed Oct 10 22:51:45 2018 (r339297) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c Wed Oct 10 22:55:31 2018 (r339298) @@ -252,6 +252,10 @@ ZFS_VDEV_QUEUE_KNOB_MIN(scrub); ZFS_VDEV_QUEUE_KNOB_MAX(scrub); ZFS_VDEV_QUEUE_KNOB_MIN(trim); ZFS_VDEV_QUEUE_KNOB_MAX(trim); +ZFS_VDEV_QUEUE_KNOB_MIN(removal); +ZFS_VDEV_QUEUE_KNOB_MAX(removal); +ZFS_VDEV_QUEUE_KNOB_MIN(initializing); +ZFS_VDEV_QUEUE_KNOB_MAX(initializing); #undef ZFS_VDEV_QUEUE_KNOB From owner-svn-src-head@freebsd.org Wed Oct 10 22:59:16 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 38DD510BF56E; Wed, 10 Oct 2018 22:59:16 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E27BE75F96; Wed, 10 Oct 2018 22:59:15 +0000 (UTC) (envelope-from allanjude@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D8E5B27666; Wed, 10 Oct 2018 22:59:15 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9AMxFLk035796; Wed, 10 Oct 2018 22:59:15 GMT (envelope-from allanjude@FreeBSD.org) Received: (from allanjude@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9AMxFf4035795; Wed, 10 Oct 2018 22:59:15 GMT (envelope-from allanjude@FreeBSD.org) Message-Id: <201810102259.w9AMxFf4035795@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: allanjude set sender to allanjude@FreeBSD.org using -f From: Allan Jude Date: Wed, 10 Oct 2018 22:59:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339299 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: head X-SVN-Commit-Author: allanjude X-SVN-Commit-Paths: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Commit-Revision: 339299 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.27 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: Wed, 10 Oct 2018 22:59:16 -0000 Author: allanjude Date: Wed Oct 10 22:59:15 2018 New Revision: 339299 URL: https://svnweb.freebsd.org/changeset/base/339299 Log: Pull in a follow-on commit to resolve a deadlock in ZFS sequential resilver (r334844) MFV/ZoL: Fix deadlock in IO pipeline commit a76f3d0437e5e974f0f748f8735af3539443b388 Author: Brian Behlendorf Date: Fri Mar 16 16:46:06 2018 -0700 Fix deadlock in IO pipeline In vdev_queue_aggregate() the zio_execute() bypass should not be called under the vdev queue lock. This can result in a deadlock as shown in the stack traces below. Drop the vdev queue lock then walk the parents of the aggregate IO to determine the list of component IOs to be bypassed. This can be done safely without holding the io_lock since the new aggregate IO has not yet been returned and its parents cannot change. --- THREAD 1 --- arc_read() zio_nowait() zio_vdev_io_start() vdev_queue_io() <--- mutex_enter(vq->vq_lock) vdev_queue_io_to_issue() vdev_queue_aggregate() zio_execute() vdev_queue_io_to_issue() vdev_queue_aggregate() zio_execute() zio_vdev_io_assess() zio_wait_for_children() <- mutex_enter(zio->io_lock) --- THREAD 2 --- (inverse order) arc_read() zio_change_priority() <- mutex_enter(zio->zio_lock) vdev_queue_change_io_priority() <- mutex_enter(vq->vq_lock) Reviewed-by: Tom Caputi Reviewed-by: Don Brady Signed-off-by: Brian Behlendorf Reported by: ZFS Leadership Meeting Reviewed by: mav Approved by: re (kib) Obtained from: ZFS-on-Linux MFC after: 2 weeks Sponsored by: Klara Systems Differential Revision: https://reviews.freebsd.org/D17495 Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c Wed Oct 10 22:55:31 2018 (r339298) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c Wed Oct 10 22:59:15 2018 (r339299) @@ -670,6 +670,7 @@ static zio_t * vdev_queue_aggregate(vdev_queue_t *vq, zio_t *zio) { zio_t *first, *last, *aio, *dio, *mandatory, *nio; + zio_link_t *zl = NULL; uint64_t maxgap = 0; uint64_t size; boolean_t stretch; @@ -813,9 +814,18 @@ vdev_queue_aggregate(vdev_queue_t *vq, zio_t *zio) zio_add_child(dio, aio); vdev_queue_io_remove(vq, dio); + } while (dio != last); + + /* + * We need to drop the vdev queue's lock to avoid a deadlock that we + * could encounter since this I/O will complete immediately. + */ + mutex_exit(&vq->vq_lock); + while ((dio = zio_walk_parents(aio, &zl)) != NULL) { zio_vdev_io_bypass(dio); zio_execute(dio); - } while (dio != last); + } + mutex_enter(&vq->vq_lock); return (aio); } From owner-svn-src-head@freebsd.org Thu Oct 11 00:54:40 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 030B910C1A48; Thu, 11 Oct 2018 00:54:40 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AB378796DE; Thu, 11 Oct 2018 00:54:39 +0000 (UTC) (envelope-from nwhitehorn@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9D425A3F; Thu, 11 Oct 2018 00:54:39 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9B0sddh097514; Thu, 11 Oct 2018 00:54:39 GMT (envelope-from nwhitehorn@FreeBSD.org) Received: (from nwhitehorn@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9B0sd47097513; Thu, 11 Oct 2018 00:54:39 GMT (envelope-from nwhitehorn@FreeBSD.org) Message-Id: <201810110054.w9B0sd47097513@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: nwhitehorn set sender to nwhitehorn@FreeBSD.org using -f From: Nathan Whitehorn Date: Thu, 11 Oct 2018 00:54:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339301 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: nwhitehorn X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 339301 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.27 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: Thu, 11 Oct 2018 00:54:40 -0000 Author: nwhitehorn Date: Thu Oct 11 00:54:39 2018 New Revision: 339301 URL: https://svnweb.freebsd.org/changeset/base/339301 Log: Loader GELI support, like lua loader, seems to be broken on PowerPC as well as on SPARC64 and can cause boot failures even when no encrypted disks are present. Presumably, the reasons, while unknown, are the same and most-likely are the result of some endian-unsafe code. Pending finding the actual problem, extend the blacklist entry for these parts of loader on SPARC to also cover all PowerPC platforms. Approved by: re (kib) Modified: head/share/mk/src.opts.mk Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Thu Oct 11 00:26:15 2018 (r339300) +++ head/share/mk/src.opts.mk Thu Oct 11 00:54:39 2018 (r339301) @@ -353,15 +353,12 @@ BROKEN_OPTIONS+=LOADER_OFW .if ${__T:Marm*} == "" && ${__T:Mmips*} == "" && ${__T:Mpowerpc*} == "" BROKEN_OPTIONS+=LOADER_UBOOT .endif -# GELI and Lua in loader currently cause boot failures on sparc64. -# Further debugging is required. -.if ${__T} == "sparc64" +# GELI and Lua in loader currently cause boot failures on sparc64 and powerpc. +# Further debugging is required -- probably they are just broken on big +# endian systems generically (they jump to null pointers or try to read +# crazy high addresses, which is typical of endianness problems). +.if ${__T} == "sparc64" || ${__T:Mpowerpc*} BROKEN_OPTIONS+=LOADER_GELI LOADER_LUA -.endif -# Lua in loader currently cause boot failures on powerpc. -# Further debugging is required. -.if ${__T} == "powerpc" || ${__T} == "powerpc64" -BROKEN_OPTIONS+=LOADER_LUA .endif .if ${__T:Mmips64*} From owner-svn-src-head@freebsd.org Thu Oct 11 04:54:02 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 996C910CF243 for ; Thu, 11 Oct 2018 04:54:02 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: from mail-it1-x142.google.com (mail-it1-x142.google.com [IPv6:2607:f8b0:4864:20::142]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 22C4C84B22 for ; Thu, 11 Oct 2018 04:54:01 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: by mail-it1-x142.google.com with SMTP id p64-v6so11426535itp.0 for ; Wed, 10 Oct 2018 21:54:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kev009.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=DsXX3UKg5/EocpUZ/svFujovgaIKxCcmHSampk9ULCk=; b=kn90EBqN2pIUmgyUUN+h6ju4Vw4HutG1MANFJRcOo6sCyQIMJeaOkiRxh7r+9nCKM2 9pEBieoqv+HXIWK/obuPBIJIbhVdNfCVYzZSYk4dYllA/6g5IcCT4YcBWIZvpR5FMiva kojLjfYnSwYK9swxVsB/x9YU7M0ru3Eu4WQCc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=DsXX3UKg5/EocpUZ/svFujovgaIKxCcmHSampk9ULCk=; b=JJmJOABh0sgYZo0tD/V0ppZHcx/2eAxv4F088dD3nfOUCcwecJGvNBWpWqMyuY59WU 6Uvwf0b7k8dln+0+ol+ah/W+XTrH7tJGHNDktaUni1DnUqQIpZSn2kCfKoWixDsVHMpE hWWZ/zXns9x/Ws1t9KyneZDRcw20kQuLkv9JQPV6uaSCSbjOY0CA57kGuBeFMjOUeAxY KWFjuDadZhlbWwTWTR4oyOVCs8r6pt6NeCDZPhSfxGTQ9MaxU4fHHaXHP3XA6qzIZiiz SbAu726Y0KI0LgqFaE601/xf79/pAPChAtpqroUnEGHkRCLlGMLphA1I8DIeQtUcirJR Qs/g== X-Gm-Message-State: ABuFfojNJfjRK6BWGt2DEBOE949v+korxSiwAxk3s4X1nop+RWJqc1Tr /jvXqQEIvUVv5hPQQbp8Mg5VtRNEA2L0YCS+QorJ7/5i/zXk4w== X-Google-Smtp-Source: ACcGV62t3KXyNDHTYTjZdH4yBCmhGw9MzwXY4RB0ETU/GFLbIjMxTr3mvGaK7G+QRqwrW0azBq27wQUIPD9D0ogi1HY= X-Received: by 2002:a02:2b29:: with SMTP id h41-v6mr37793jaa.12.1539233641259; Wed, 10 Oct 2018 21:54:01 -0700 (PDT) MIME-Version: 1.0 References: <2f065155-52c2-1036-78da-f6b337c69541@NLnetLabs.nl> <86a7nl7dly.fsf@next.des.no> In-Reply-To: <86a7nl7dly.fsf@next.des.no> From: Kevin Bowling Date: Wed, 10 Oct 2018 21:53:49 -0700 Message-ID: Subject: Re: a word of caution about the new default of so-reuseport on FreeBSD To: des@des.no Cc: Harry Schmalzbauer , svn-src-head@freebsd.org, src-committers Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 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: Thu, 11 Oct 2018 04:54:02 -0000 Without looking at the unbound source, I assume they want the semantics of what we call SO_REUSEPORT_LB in FreeBSD >=3D 12.0. See setsockopt(2) for a brief description. Whether it makes sense to conditionalize that or simply disable the sockopt I have no opinion on just sharing the above knowledge. Regards, On Wed, Oct 10, 2018 at 1:26 PM Dag-Erling Sm=C3=B8rgrav wrote= : > > Harry Schmalzbauer writes: > > Most likely you are aware about the "so-reuseport" topic via Unbound-us= ers. > > I didn't follow the diff/issue at all, just wanted to point it out, so > > somebody from the experts team can decide if 1.8.1 is suitable (with > > the 1.8.1 defaults) for shipping... > > I'll apply the upstream patch (r4932) before the release. Right now I > need to focus on DNS-over-TLS support. > > DES > -- > Dag-Erling Sm=C3=B8rgrav - des@des.no > _______________________________________________ > 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-unsubscribe@freebsd.org" From owner-svn-src-head@freebsd.org Thu Oct 11 08:11:15 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EDA0210AC6BB for ; Thu, 11 Oct 2018 08:11:14 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id 8992A8C6C1; Thu, 11 Oct 2018 08:11:14 +0000 (UTC) (envelope-from des@des.no) Received: from next.des.no (smtp.des.no [194.63.250.102]) by smtp.des.no (Postfix) with ESMTP id 110D78BB1; Thu, 11 Oct 2018 08:11:14 +0000 (UTC) Received: by next.des.no (Postfix, from userid 1001) id 3071EB72B; Thu, 11 Oct 2018 10:11:14 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Kevin Bowling Cc: Harry Schmalzbauer , svn-src-head@freebsd.org, src-committers Subject: Re: a word of caution about the new default of so-reuseport on FreeBSD In-Reply-To: (Kevin Bowling's message of "Wed, 10 Oct 2018 21:53:49 -0700") References: <2f065155-52c2-1036-78da-f6b337c69541@NLnetLabs.nl> <86a7nl7dly.fsf@next.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (berkeley-unix) Date: Thu, 11 Oct 2018 10:11:14 +0200 Message-ID: <86h8hs6gyl.fsf@next.des.no> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 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: Thu, 11 Oct 2018 08:11:15 -0000 Kevin Bowling writes: > Whether it makes sense to conditionalize that or simply disable the > sockopt I have no opinion on just sharing the above knowledge. The upstream patch just flips the default back. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From owner-svn-src-head@freebsd.org Thu Oct 11 08:14:32 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B5F8310AC7A9; Thu, 11 Oct 2018 08:14:32 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 612AA8CAC7; Thu, 11 Oct 2018 08:14:32 +0000 (UTC) (envelope-from des@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 568755D66; Thu, 11 Oct 2018 08:14:32 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9B8EWpw024442; Thu, 11 Oct 2018 08:14:32 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9B8EWH3024441; Thu, 11 Oct 2018 08:14:32 GMT (envelope-from des@FreeBSD.org) Message-Id: <201810110814.w9B8EWH3024441@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Thu, 11 Oct 2018 08:14:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339303 - in head/contrib/ldns: . ldns X-SVN-Group: head X-SVN-Commit-Author: des X-SVN-Commit-Paths: in head/contrib/ldns: . ldns X-SVN-Commit-Revision: 339303 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.27 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: Thu, 11 Oct 2018 08:14:32 -0000 Author: des Date: Thu Oct 11 08:14:31 2018 New Revision: 339303 URL: https://svnweb.freebsd.org/changeset/base/339303 Log: Regenerate: remove GOST, enable DANE-TA now that we have OpenSSL 1.1.1. Approved by: re (gjb) Modified: head/contrib/ldns/freebsd-configure.sh head/contrib/ldns/ldns/config.h Modified: head/contrib/ldns/freebsd-configure.sh ============================================================================== --- head/contrib/ldns/freebsd-configure.sh Thu Oct 11 07:34:56 2018 (r339302) +++ head/contrib/ldns/freebsd-configure.sh Thu Oct 11 08:14:31 2018 (r339303) @@ -24,7 +24,7 @@ unset CFLAGS CPPFLAGS LDFLAGS LD_LIBRARY_PATH LIBS export PATH=/bin:/sbin:/usr/bin:/usr/sbin cd $ldns -./configure --prefix= --exec-prefix=/usr --disable-dane-ta-usage +./configure --prefix= --exec-prefix=/usr cd $ldns/drill ./configure --prefix= --exec-prefix=/usr Modified: head/contrib/ldns/ldns/config.h ============================================================================== --- head/contrib/ldns/ldns/config.h Thu Oct 11 07:34:56 2018 (r339302) +++ head/contrib/ldns/ldns/config.h Thu Oct 11 08:14:31 2018 (r339303) @@ -362,7 +362,7 @@ #define USE_DANE 1 /* Define this to enable DANE-TA usage type support. */ -/* #undef USE_DANE_TA_USAGE */ +#define USE_DANE_TA_USAGE 1 /* Define this to enable DANE verify support. */ #define USE_DANE_VERIFY 1 @@ -380,7 +380,7 @@ /* #undef USE_ED448 */ /* Define this to enable GOST support. */ -#define USE_GOST 1 +/* #undef USE_GOST */ /* Define this to enable SHA256 and SHA512 support. */ #define USE_SHA2 1 From owner-svn-src-head@freebsd.org Thu Oct 11 13:19:18 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3274510BAA38; Thu, 11 Oct 2018 13:19:18 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D731D97B71; Thu, 11 Oct 2018 13:19:17 +0000 (UTC) (envelope-from emaste@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C3BC210E9F; Thu, 11 Oct 2018 13:19:17 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9BDJHmT080252; Thu, 11 Oct 2018 13:19:17 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9BDJH3Q080250; Thu, 11 Oct 2018 13:19:17 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201810111319.w9BDJH3Q080250@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 11 Oct 2018 13:19:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339304 - in head: contrib/llvm/tools/lld/ELF lib/clang/include/lld/Common X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in head: contrib/llvm/tools/lld/ELF lib/clang/include/lld/Common X-SVN-Commit-Revision: 339304 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.27 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: Thu, 11 Oct 2018 13:19:18 -0000 Author: emaste Date: Thu Oct 11 13:19:17 2018 New Revision: 339304 URL: https://svnweb.freebsd.org/changeset/base/339304 Log: lld: set sh_link and sh_info for .rela.plt sections ELF spec says that for SHT_REL and SHT_RELA sh_link should reference the associated string table and sh_info should reference the "section to which the relocation applies." ELF Tool Chain's elfcopy / strip use this (in part) to control whether or not the relocation entry is copied to the output. LLVM PR 37538 https://bugs.llvm.org/show_bug.cgi?id=37538 Approved by: re (kib) Obtained from: llvm r344226 (backported for 6.0) Modified: head/contrib/llvm/tools/lld/ELF/SyntheticSections.cpp head/lib/clang/include/lld/Common/Version.inc Modified: head/contrib/llvm/tools/lld/ELF/SyntheticSections.cpp ============================================================================== --- head/contrib/llvm/tools/lld/ELF/SyntheticSections.cpp Thu Oct 11 08:14:31 2018 (r339303) +++ head/contrib/llvm/tools/lld/ELF/SyntheticSections.cpp Thu Oct 11 13:19:17 2018 (r339304) @@ -1213,11 +1213,13 @@ void RelocationBaseSection::addReloc(const DynamicRelo void RelocationBaseSection::finalizeContents() { // If all relocations are R_*_RELATIVE they don't refer to any // dynamic symbol and we don't need a dynamic symbol table. If that - // is the case, just use 0 as the link. - Link = InX::DynSymTab ? InX::DynSymTab->getParent()->SectionIndex : 0; + // is the case, just use the index of the regular symbol table section. + getParent()->Link = InX::DynSymTab ? + InX::DynSymTab->getParent()->SectionIndex : + InX::SymTab->getParent()->SectionIndex; - // Set required output section properties. - getParent()->Link = Link; + if (InX::RelaIplt == this || InX::RelaPlt == this) + getParent()->Info = InX::GotPlt->getParent()->SectionIndex; } template Modified: head/lib/clang/include/lld/Common/Version.inc ============================================================================== --- head/lib/clang/include/lld/Common/Version.inc Thu Oct 11 08:14:31 2018 (r339303) +++ head/lib/clang/include/lld/Common/Version.inc Thu Oct 11 13:19:17 2018 (r339304) @@ -7,4 +7,4 @@ #define LLD_REPOSITORY_STRING "FreeBSD" // - -#define LLD_REVISION_STRING "335540-1200004" +#define LLD_REVISION_STRING "335540-1200005" From owner-svn-src-head@freebsd.org Thu Oct 11 13:58:52 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 618C310BBAFB; Thu, 11 Oct 2018 13:58:52 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 060977145F; Thu, 11 Oct 2018 13:58:52 +0000 (UTC) (envelope-from 0mp@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D555711579; Thu, 11 Oct 2018 13:58:51 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9BDwpHV001717; Thu, 11 Oct 2018 13:58:51 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9BDwpQ0001716; Thu, 11 Oct 2018 13:58:51 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <201810111358.w9BDwpQ0001716@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Thu, 11 Oct 2018 13:58:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339305 - head/lib/libusb X-SVN-Group: head X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: head/lib/libusb X-SVN-Commit-Revision: 339305 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.27 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: Thu, 11 Oct 2018 13:58:52 -0000 Author: 0mp (ports committer) Date: Thu Oct 11 13:58:51 2018 New Revision: 339305 URL: https://svnweb.freebsd.org/changeset/base/339305 Log: libusb(3): Update the link to the libusb homepage. While here, pet mandoc & igor. Reviewed by: bcr, hselasky Approved by: re (kib), krion (mentor, implicit), mat (mentor, implicit) Differential Revision: https://reviews.freebsd.org/D17516 Modified: head/lib/libusb/libusb.3 Modified: head/lib/libusb/libusb.3 ============================================================================== --- head/lib/libusb/libusb.3 Thu Oct 11 13:19:17 2018 (r339304) +++ head/lib/libusb/libusb.3 Thu Oct 11 13:58:51 2018 (r339305) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 23, 2016 +.Dd October 11, 2018 .Dt LIBUSB 3 .Os .Sh NAME @@ -330,7 +330,7 @@ and a LIBUSB_ERROR code on error. .Ft int .Fn libusb_get_config_descriptor "libusb_device *dev" "uint8_t config_index" "libusb_config_descriptor **config" Get a USB configuration descriptor based on its index -.Fa idx. +.Fa idx . Returns 0 on success, LIBUSB_ERROR_NOT_FOUND if the configuration does not exist and a LIBUSB_ERROR code on error. .Pp @@ -581,7 +581,9 @@ are no threads currently handling events. Acquire the event_waiters lock. This lock is designed to be obtained in the situation where you want to be aware when events are completed, but some other -thread is event handling so calling libusb_handle_events() is not allowed. +thread is event handling so calling +.Fn libusb_handle_events +is not allowed. .Pp .Ft void .Fn libusb_unlock_event_waiters "libusb_context *ctx" @@ -591,10 +593,12 @@ Release the event_waiters lock. .Fn libusb_wait_for_event "libusb_context *ctx" "struct timeval *tv" Wait for another thread to signal completion of an event. Must be called -with the event waiters lock held, see libusb_lock_event_waiters(). +with the event waiters lock held, see +.Fn libusb_lock_event_waiters . This will block until the timeout expires or a transfer completes or a thread releases -the event handling lock through libusb_unlock_events(). +the event handling lock through +.Fn libusb_unlock_events . Returns 0 after a transfer completes or another thread stops event handling, and 1 if the timeout expired. @@ -662,7 +666,7 @@ that libusb uses as an event source. .Pp .Ft const struct libusb_pollfd ** .Fn libusb_get_pollfds "libusb_context *ctx" -Retrive a list of file descriptors that should be polled by your main loop as +Retrieve a list of file descriptors that should be polled by your main loop as libusb event sources. Returns a NULL-terminated list on success or NULL on failure. .Pp @@ -747,7 +751,7 @@ The library is also compliant with LibUSB version 0.1. .Xr usbconfig 8 , .Xr usbdump 8 .Pp -.Pa http://libusb.sourceforge.net/ +.Lk https://libusb.info/ .Sh HISTORY .Nm support first appeared in From owner-svn-src-head@freebsd.org Thu Oct 11 17:16:40 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1431D10C16AD; Thu, 11 Oct 2018 17:16:40 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B526879405; Thu, 11 Oct 2018 17:16:39 +0000 (UTC) (envelope-from kevans@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A543A13624; Thu, 11 Oct 2018 17:16:39 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9BHGdJa004790; Thu, 11 Oct 2018 17:16:39 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9BHGd09004789; Thu, 11 Oct 2018 17:16:39 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201810111716.w9BHGd09004789@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 11 Oct 2018 17:16:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339307 - head/stand/lua X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/stand/lua X-SVN-Commit-Revision: 339307 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.27 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: Thu, 11 Oct 2018 17:16:40 -0000 Author: kevans Date: Thu Oct 11 17:16:39 2018 New Revision: 339307 URL: https://svnweb.freebsd.org/changeset/base/339307 Log: lualoader: Provide a 'menu' command to redraw the menu at the loader prompt Reported by: allanjude Approved by: re (kib) Modified: head/stand/lua/menu.lua Modified: head/stand/lua/menu.lua ============================================================================== --- head/stand/lua/menu.lua Thu Oct 11 15:12:10 2018 (r339306) +++ head/stand/lua/menu.lua Thu Oct 11 17:16:39 2018 (r339307) @@ -29,7 +29,7 @@ -- $FreeBSD$ -- - +local cli = require("cli") local core = require("core") local color = require("color") local config = require("config") @@ -464,6 +464,11 @@ function menu.autoboot(delay) local cmd = loader.getenv("menu_timeout_command") or "boot" cli_execute_unparsed(cmd) +end + +-- CLI commands +function cli.menu(...) + menu.run() end return menu From owner-svn-src-head@freebsd.org Thu Oct 11 17:17:55 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 54B6310C1791; Thu, 11 Oct 2018 17:17:55 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 05C497957F; Thu, 11 Oct 2018 17:17:55 +0000 (UTC) (envelope-from kevans@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F35E913627; Thu, 11 Oct 2018 17:17:54 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9BHHs3S004893; Thu, 11 Oct 2018 17:17:54 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9BHHsNF004892; Thu, 11 Oct 2018 17:17:54 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201810111717.w9BHHsNF004892@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 11 Oct 2018 17:17:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339308 - head/stand/defaults X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/stand/defaults X-SVN-Commit-Revision: 339308 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.27 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: Thu, 11 Oct 2018 17:17:55 -0000 Author: kevans Date: Thu Oct 11 17:17:54 2018 New Revision: 339308 URL: https://svnweb.freebsd.org/changeset/base/339308 Log: Enable lualoader's kernel autodetection, disabled on install media As documented in loader.conf(5), kernels_autodetect="YES" will cause the Lua scripts to effectively scan /boot for directories with a "kernel" file inside, to be listed in the loader menu. Approved by: re (kib) Modified: head/stand/defaults/loader.conf Modified: head/stand/defaults/loader.conf ============================================================================== --- head/stand/defaults/loader.conf Thu Oct 11 17:16:39 2018 (r339307) +++ head/stand/defaults/loader.conf Thu Oct 11 17:17:54 2018 (r339308) @@ -92,6 +92,7 @@ efi_max_resolution="1x1" # Set the max resolution for # 480p, 720p, 1080p, 2160p/4k, 5k, or specify # WidthxHeight (e.g. 1920x1080) #kernels="kernel kernel.old" # Kernels to display in the boot menu +kernels_autodetect="YES" # Auto-detect kernel directories in /boot #loader_logo="orbbw" # Desired logo: orbbw, orb, fbsdbw, beastiebw, beastie, none #comconsole_speed="9600" # Set the current serial console speed #console="vidconsole" # A comma separated list of console(s) From owner-svn-src-head@freebsd.org Thu Oct 11 17:18:50 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1A57210C1833; Thu, 11 Oct 2018 17:18:50 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C4171796DB; Thu, 11 Oct 2018 17:18:49 +0000 (UTC) (envelope-from kevans@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BEF9A13629; Thu, 11 Oct 2018 17:18:49 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9BHInJj004971; Thu, 11 Oct 2018 17:18:49 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9BHInYV004970; Thu, 11 Oct 2018 17:18:49 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201810111718.w9BHInYV004970@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 11 Oct 2018 17:18:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339309 - head/release X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/release X-SVN-Commit-Revision: 339309 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.27 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: Thu, 11 Oct 2018 17:18:50 -0000 Author: kevans Date: Thu Oct 11 17:18:49 2018 New Revision: 339309 URL: https://svnweb.freebsd.org/changeset/base/339309 Log: Disable kernels_autodetect on installation media This feature is disabled on install media as these generally won't have any interesting kernels to be listed other than the default kernel, so the potential performance penalty in these situations likely isn't worth it. Approved by: re (kib) Modified: head/release/Makefile Modified: head/release/Makefile ============================================================================== --- head/release/Makefile Thu Oct 11 17:17:54 2018 (r339308) +++ head/release/Makefile Thu Oct 11 17:18:49 2018 (r339309) @@ -212,6 +212,7 @@ disc1: packagesystem echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf + echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf cp ${.CURDIR}/rc.local ${.TARGET}/etc touch ${.TARGET} @@ -239,6 +240,7 @@ bootonly: packagesystem echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf + echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf cp ${.CURDIR}/rc.local ${.TARGET}/etc dvd: packagesystem @@ -263,6 +265,7 @@ dvd: packagesystem echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf + echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf cp ${.CURDIR}/rc.local ${.TARGET}/etc touch ${.TARGET} From owner-svn-src-head@freebsd.org Thu Oct 11 18:24:12 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 37E1E10C323F; Thu, 11 Oct 2018 18:24:12 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DAAB97BA27; Thu, 11 Oct 2018 18:24:11 +0000 (UTC) (envelope-from jkim@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D402B141D6; Thu, 11 Oct 2018 18:24:11 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9BIOBwB040434; Thu, 11 Oct 2018 18:24:11 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9BIOBp6040433; Thu, 11 Oct 2018 18:24:11 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201810111824.w9BIOBp6040433@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Thu, 11 Oct 2018 18:24:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339310 - head X-SVN-Group: head X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 339310 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.27 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: Thu, 11 Oct 2018 18:24:12 -0000 Author: jkim Date: Thu Oct 11 18:24:11 2018 New Revision: 339310 URL: https://svnweb.freebsd.org/changeset/base/339310 Log: Remove re-added header files from ObsoleteFiles.inc. Approved by: re (delphij) Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Thu Oct 11 17:18:49 2018 (r339309) +++ head/ObsoleteFiles.inc Thu Oct 11 18:24:11 2018 (r339310) @@ -4856,9 +4856,7 @@ OLD_FILES+=usr/include/openssl/bio_lcl.h OLD_FILES+=usr/include/openssl/e_os.h OLD_FILES+=usr/include/openssl/fips.h OLD_FILES+=usr/include/openssl/fips_rand.h -OLD_FILES+=usr/include/openssl/md2.h OLD_FILES+=usr/include/openssl/pq_compat.h -OLD_FILES+=usr/include/openssl/store.h OLD_FILES+=usr/include/openssl/tmdiff.h OLD_FILES+=usr/include/openssl/ui_locl.h OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_id_callback.3.gz From owner-svn-src-head@freebsd.org Thu Oct 11 18:26:19 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B4AFC10C3308; Thu, 11 Oct 2018 18:26:19 +0000 (UTC) (envelope-from yuripv@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6815B7BBBE; Thu, 11 Oct 2018 18:26:19 +0000 (UTC) (envelope-from yuripv@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 461E5141D7; Thu, 11 Oct 2018 18:26:19 +0000 (UTC) (envelope-from yuripv@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9BIQJUO040595; Thu, 11 Oct 2018 18:26:19 GMT (envelope-from yuripv@FreeBSD.org) Received: (from yuripv@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9BIQJRc040594; Thu, 11 Oct 2018 18:26:19 GMT (envelope-from yuripv@FreeBSD.org) Message-Id: <201810111826.w9BIQJRc040594@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuripv set sender to yuripv@FreeBSD.org using -f From: Yuri Pankov Date: Thu, 11 Oct 2018 18:26:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339311 - head/tools/tools/locale/etc X-SVN-Group: head X-SVN-Commit-Author: yuripv X-SVN-Commit-Paths: head/tools/tools/locale/etc X-SVN-Commit-Revision: 339311 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.27 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: Thu, 11 Oct 2018 18:26:19 -0000 Author: yuripv Date: Thu Oct 11 18:26:18 2018 New Revision: 339311 URL: https://svnweb.freebsd.org/changeset/base/339311 Log: Add fbsd:nokeywords to tools/tools/locale/etc/manual-input.UTF-8. Approved by: re (gjb), kib (mentor) Modified: Directory Properties: head/tools/tools/locale/etc/manual-input.UTF-8 (props changed) From owner-svn-src-head@freebsd.org Thu Oct 11 18:27:20 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 825B010C33F0; Thu, 11 Oct 2018 18:27:20 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 353FF7BD3F; Thu, 11 Oct 2018 18:27:20 +0000 (UTC) (envelope-from jhb@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 16059141D9; Thu, 11 Oct 2018 18:27:20 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9BIRJNG040677; Thu, 11 Oct 2018 18:27:19 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9BIRJla040675; Thu, 11 Oct 2018 18:27:19 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201810111827.w9BIRJla040675@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Thu, 11 Oct 2018 18:27:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339312 - in head/sys/amd64: include vmm/intel X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in head/sys/amd64: include vmm/intel X-SVN-Commit-Revision: 339312 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.27 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: Thu, 11 Oct 2018 18:27:20 -0000 Author: jhb Date: Thu Oct 11 18:27:19 2018 New Revision: 339312 URL: https://svnweb.freebsd.org/changeset/base/339312 Log: Fully restore the GDTR, IDTR, and LDTR after VT-x VM exits. The VT-x VMCS only stores the base address of the GDTR and IDTR. As a result, VM exits use a fixed limit of 0xffff for the host GDTR and IDTR losing the smaller limits set in when the initial GDT is loaded on each CPU during boot. Explicitly save and restore the full GDTR and IDTR contents around VM entries and exits to restore the correct limit. Similarly, explicitly save and restore the LDT selector. VM exits always clear the host LDTR as if the LDT was loaded with a NULL selector and a userspace hypervisor is probably using a NULL selector anyway, but save and restore the LDT explicitly just to be safe. PR: 230773 Reported by: John Levon Reviewed by: kib Tested by: araujo Approved by: re (rgrimes) MFC after: 1 week Modified: head/sys/amd64/include/cpufunc.h head/sys/amd64/vmm/intel/vmx.c Modified: head/sys/amd64/include/cpufunc.h ============================================================================== --- head/sys/amd64/include/cpufunc.h Thu Oct 11 18:26:18 2018 (r339311) +++ head/sys/amd64/include/cpufunc.h Thu Oct 11 18:27:19 2018 (r339312) @@ -730,6 +730,15 @@ lldt(u_short sel) __asm __volatile("lldt %0" : : "r" (sel)); } +static __inline u_short +sldt(void) +{ + u_short sel; + + __asm __volatile("sldt %0" : "=r" (sel)); + return (sel); +} + static __inline void ltr(u_short sel) { Modified: head/sys/amd64/vmm/intel/vmx.c ============================================================================== --- head/sys/amd64/vmm/intel/vmx.c Thu Oct 11 18:26:18 2018 (r339311) +++ head/sys/amd64/vmm/intel/vmx.c Thu Oct 11 18:27:19 2018 (r339312) @@ -2833,6 +2833,8 @@ vmx_run(void *arg, int vcpu, register_t rip, pmap_t pm struct vm_exit *vmexit; struct vlapic *vlapic; uint32_t exit_reason; + struct region_descriptor gdtr, idtr; + uint16_t ldt_sel; vmx = arg; vm = vmx->vm; @@ -2924,10 +2926,30 @@ vmx_run(void *arg, int vcpu, register_t rip, pmap_t pm break; } + /* + * VM exits restore the base address but not the + * limits of GDTR and IDTR. The VMCS only stores the + * base address, so VM exits set the limits to 0xffff. + * Save and restore the full GDTR and IDTR to restore + * the limits. + * + * The VMCS does not save the LDTR at all, and VM + * exits clear LDTR as if a NULL selector were loaded. + * The userspace hypervisor probably doesn't use a + * LDT, but save and restore it to be safe. + */ + sgdt(&gdtr); + sidt(&idtr); + ldt_sel = sldt(); + vmx_run_trace(vmx, vcpu); vmx_dr_enter_guest(vmxctx); rc = vmx_enter_guest(vmxctx, vmx, launched); vmx_dr_leave_guest(vmxctx); + + bare_lgdt(&gdtr); + lidt(&idtr); + lldt(ldt_sel); /* Collect some information for VM exit processing */ vmexit->rip = rip = vmcs_guest_rip(); From owner-svn-src-head@freebsd.org Thu Oct 11 18:30:14 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3F1C410C35D7; Thu, 11 Oct 2018 18:30:14 +0000 (UTC) (envelope-from yuripv@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DDEBC7BFC2; Thu, 11 Oct 2018 18:30:13 +0000 (UTC) (envelope-from yuripv@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D4C53141DE; Thu, 11 Oct 2018 18:30:13 +0000 (UTC) (envelope-from yuripv@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9BIUDJ4040893; Thu, 11 Oct 2018 18:30:13 GMT (envelope-from yuripv@FreeBSD.org) Received: (from yuripv@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9BIUDw9040890; Thu, 11 Oct 2018 18:30:13 GMT (envelope-from yuripv@FreeBSD.org) Message-Id: <201810111830.w9BIUDw9040890@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuripv set sender to yuripv@FreeBSD.org using -f From: Yuri Pankov Date: Thu, 11 Oct 2018 18:30:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339313 - in head: share/ctypedef tools/tools/locale tools/tools/locale/etc X-SVN-Group: head X-SVN-Commit-Author: yuripv X-SVN-Commit-Paths: in head: share/ctypedef tools/tools/locale tools/tools/locale/etc X-SVN-Commit-Revision: 339313 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.27 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: Thu, 11 Oct 2018 18:30:14 -0000 Author: yuripv Date: Thu Oct 11 18:30:12 2018 New Revision: 339313 URL: https://svnweb.freebsd.org/changeset/base/339313 Log: Restore some of the ctype definitions reported in the PR from pre-CLDR data, namely 0xE000-0xF8FF private use area, and 0xFF00-0xFFF half- and fullwidth punctuation. While here, update tools/tools/locale/README based on my experience rebuilding the locale data. PR: 225692 Reviewed by: bapt, cem (previous version) Approved by: re (gjb), kib (mentor) Differential Revision: https://reviews.freebsd.org/D17471 Modified: head/share/ctypedef/en_US.UTF-8.src head/tools/tools/locale/README head/tools/tools/locale/etc/common.UTF-8.src head/tools/tools/locale/etc/manual-input.UTF-8 Modified: head/share/ctypedef/en_US.UTF-8.src ============================================================================== --- head/share/ctypedef/en_US.UTF-8.src Thu Oct 11 18:27:19 2018 (r339312) +++ head/share/ctypedef/en_US.UTF-8.src Thu Oct 11 18:30:12 2018 (r339313) @@ -6241,6 +6241,12 @@ graph ;...;;...; ********************************************************************** +* 0xE000 - 0xF8FF Private Use Area (from pre-CLDR data) +********************************************************************** + +graph ;...; + +********************************************************************** * 0xFB50 - 0xFDFF Arabic Presentation Forms (differential) ********************************************************************** @@ -6277,6 +6283,17 @@ punct ;...; ********************************************************************** blank + +********************************************************************** +* 0xFF00 - 0xFFFF Half- and Fullwidth Punctuation (from pre-CLDR data) +********************************************************************** + +punct ;...;;/ + ;...;;/ + ;...;;/ + ;...;;/ + ;...;;/ + ;...; ********************************************************************** * 0x10300 - 0x1032F Old Italic Modified: head/tools/tools/locale/README ============================================================================== --- head/tools/tools/locale/README Thu Oct 11 18:27:19 2018 (r339312) +++ head/tools/tools/locale/README Thu Oct 11 18:30:12 2018 (r339313) @@ -2,23 +2,37 @@ To generate the locales: -Tools needed: java, perl, devel/p5-Tie-IxHash, converters/p5-Text-Iconv and -textproc/p5-XML-Parser +Tools needed: + java (openjdk >= 8) + perl + converters/p5-Text-Iconv + devel/p5-Tie-IxHash + textproc/p5-XML-Parser -fetch cldr data from: http://cldr.unicode.org -extract in a directory ~/unicode/cldr/v30.0.3 for example -fetch unidata from http://www.unicode.org/Public/zipped/ (latest version) -extract in a directory ~/unicode/UNIDATA/9.0.0 for example +Fetch CLDR data from: http://unicode.org/Public/cldr/. You need all of the +core.zip, keyboards.zip, and tools.zip. -Note that the prebuilt cldr tools are not working on freebsd, it needs to -be rebuilt: -cd $CLDRDIR/tools/java -ant build +Extract: + mkdir -p ~/unicode/cldr/v33.0 + cd ~/unicode/cldr/v33.0 + unzip ~/core.zip ~/keyboards.zip ~/tools.zip -either modify tools/tools/locales/etc/unicode.conf or export variables: -CLDRDIR="~/unicode/cldr/v30.0.3" -UNIDATADIR="~/unicode/UNIDATA/9.0.0" +Fetch unidata (UCD.zip) from http://www.unicode.org/Public/zipped/latest. -run: -make POSIX -make install +Extract: + mkdir -p ~/unicode/UNIDATA/11.0.0 + cd ~/unicode/UNIDATA/11.0.0 + unzip ~/UCD.zip + +Either modify tools/tools/locales/etc/unicode.conf or export variables: + CLDRDIR=~/unicode/cldr/v33.0; export CLDRDIR + UNIDATADIR=~/unicode/UNIDATA/9.0.0; export UNIDATADIR + +Build the CLDR tools: + cd $CLDRDIR/tools/java + ant jar + +Run: + make POSIX + make + make install Modified: head/tools/tools/locale/etc/common.UTF-8.src ============================================================================== --- head/tools/tools/locale/etc/common.UTF-8.src Thu Oct 11 18:27:19 2018 (r339312) +++ head/tools/tools/locale/etc/common.UTF-8.src Thu Oct 11 18:30:12 2018 (r339313) @@ -6241,6 +6241,12 @@ graph ;...;;...; ********************************************************************** +* 0xE000 - 0xF8FF Private Use Area (from pre-CLDR data) +********************************************************************** + +graph ;...; + +********************************************************************** * 0xFB50 - 0xFDFF Arabic Presentation Forms (differential) ********************************************************************** @@ -6277,6 +6283,17 @@ punct ;...; ********************************************************************** blank + +********************************************************************** +* 0xFF00 - 0xFFFF Half- and Fullwidth Punctuation (from pre-CLDR data) +********************************************************************** + +punct ;...;;/ + ;...;;/ + ;...;;/ + ;...;;/ + ;...;;/ + ;...; ********************************************************************** * 0x10300 - 0x1032F Old Italic Modified: head/tools/tools/locale/etc/manual-input.UTF-8 ============================================================================== --- head/tools/tools/locale/etc/manual-input.UTF-8 Thu Oct 11 18:27:19 2018 (r339312) +++ head/tools/tools/locale/etc/manual-input.UTF-8 Thu Oct 11 18:30:12 2018 (r339313) @@ -877,6 +877,12 @@ graph ;...;;...; ********************************************************************** +* 0xE000 - 0xF8FF Private Use Area (from pre-CLDR data) +********************************************************************** + +graph ;...; + +********************************************************************** * 0xFB50 - 0xFDFF Arabic Presentation Forms (differential) ********************************************************************** @@ -913,6 +919,17 @@ punct ;...; ********************************************************************** blank + +********************************************************************** +* 0xFF00 - 0xFFFF Half- and Fullwidth Punctuation (from pre-CLDR data) +********************************************************************** + +punct ;...;;/ + ;...;;/ + ;...;;/ + ;...;;/ + ;...;;/ + ;...; ********************************************************************** * 0x10300 - 0x1032F Old Italic From owner-svn-src-head@freebsd.org Thu Oct 11 21:18:52 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8E5FE10C83E0; Thu, 11 Oct 2018 21:18:52 +0000 (UTC) (envelope-from yuripv@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4264082BB0; Thu, 11 Oct 2018 21:18:52 +0000 (UTC) (envelope-from yuripv@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 38B4915DF5; Thu, 11 Oct 2018 21:18:52 +0000 (UTC) (envelope-from yuripv@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9BLIqTh033424; Thu, 11 Oct 2018 21:18:52 GMT (envelope-from yuripv@FreeBSD.org) Received: (from yuripv@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9BLIqEa033423; Thu, 11 Oct 2018 21:18:52 GMT (envelope-from yuripv@FreeBSD.org) Message-Id: <201810112118.w9BLIqEa033423@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuripv set sender to yuripv@FreeBSD.org using -f From: Yuri Pankov Date: Thu, 11 Oct 2018 21:18:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339318 - head/share/man/man9 X-SVN-Group: head X-SVN-Commit-Author: yuripv X-SVN-Commit-Paths: head/share/man/man9 X-SVN-Commit-Revision: 339318 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.27 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: Thu, 11 Oct 2018 21:18:52 -0000 Author: yuripv Date: Thu Oct 11 21:18:51 2018 New Revision: 339318 URL: https://svnweb.freebsd.org/changeset/base/339318 Log: MODULE_PNP_INFO(9): catch up with r338948, and remove the element size parameter from the man page. Reviewed by: cem, imp Approved by: re (gjb), kib (mentor) Differential Revision: https://reviews.freebsd.org/D17436 Modified: head/share/man/man9/MODULE_PNP_INFO.9 Modified: head/share/man/man9/MODULE_PNP_INFO.9 ============================================================================== --- head/share/man/man9/MODULE_PNP_INFO.9 Thu Oct 11 20:44:25 2018 (r339317) +++ head/share/man/man9/MODULE_PNP_INFO.9 Thu Oct 11 21:18:51 2018 (r339318) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 2, 2018 +.Dd October 5, 2018 .Dt MODULE_PNP_INFO 9 .Os .Sh NAME @@ -38,7 +38,6 @@ .Fa "bus" .Fa "module" .Fa "void *table" -.Fa "size_t entry_len" .Fa "size_t num_entries" .Fc .\" @@ -143,11 +142,6 @@ parameter points to the device matching data with entr .Fa descriptor_string . .Pp The -.Fa entry_len -parameter is the size of each table entry, i.e., -.Ql sizeof(table[0]) . -.Pp -The .Fa num_entries parameter is the number of entries in the table, i.e., .Ql nitems(table) . @@ -178,7 +172,7 @@ static struct my_pciids { }; MODULE_PNP_INFO("W32:vendor/device;D:#", pci, my_driver, my_ids, - sizeof(my_ids[0]), nitems(my_ids)); + nitems(my_ids)); .Ed .It Sy Example 2\&: No Using T for common vendor value .Pp @@ -198,7 +192,7 @@ static struct my_pciids { }; MODULE_PNP_INFO("U16:device;D:#;T:vendor=0x1234", pci, my_driver, - my_ids, sizeof(my_ids[0]), nitems(my_ids)); + my_ids, nitems(my_ids)); .Ed .El .\" From owner-svn-src-head@freebsd.org Thu Oct 11 22:27:13 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BF18910C9D64; Thu, 11 Oct 2018 22:27:13 +0000 (UTC) (envelope-from yuripv@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 64C4384E97; Thu, 11 Oct 2018 22:27:13 +0000 (UTC) (envelope-from yuripv@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5A0E8169AE; Thu, 11 Oct 2018 22:27:13 +0000 (UTC) (envelope-from yuripv@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9BMRDOx068548; Thu, 11 Oct 2018 22:27:13 GMT (envelope-from yuripv@FreeBSD.org) Received: (from yuripv@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9BMRDDO068547; Thu, 11 Oct 2018 22:27:13 GMT (envelope-from yuripv@FreeBSD.org) Message-Id: <201810112227.w9BMRDDO068547@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuripv set sender to yuripv@FreeBSD.org using -f From: Yuri Pankov Date: Thu, 11 Oct 2018 22:27:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339319 - head/sys/dev/ixgbe X-SVN-Group: head X-SVN-Commit-Author: yuripv X-SVN-Commit-Paths: head/sys/dev/ixgbe X-SVN-Commit-Revision: 339319 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.27 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: Thu, 11 Oct 2018 22:27:13 -0000 Author: yuripv Date: Thu Oct 11 22:27:12 2018 New Revision: 339319 URL: https://svnweb.freebsd.org/changeset/base/339319 Log: Fix PNP entries for if_ix and if_ixv properly using the IFLIB_PNP_INFO() macro. Reviewed by: imp, sbruno Approved by: re (gjb), kib (mentor) Differential Revision: https://reviews.freebsd.org/D17473 Modified: head/sys/dev/ixgbe/if_ix.c head/sys/dev/ixgbe/if_ixv.c Modified: head/sys/dev/ixgbe/if_ix.c ============================================================================== --- head/sys/dev/ixgbe/if_ix.c Thu Oct 11 21:18:51 2018 (r339318) +++ head/sys/dev/ixgbe/if_ix.c Thu Oct 11 22:27:12 2018 (r339319) @@ -237,9 +237,7 @@ static driver_t ix_driver = { devclass_t ix_devclass; DRIVER_MODULE(ix, pci, ix_driver, ix_devclass, 0, 0); -MODULE_PNP_INFO("U16:vendor;U16:device", pci, ix, ixgbe_vendor_info_array, - nitems(ixgbe_vendor_info_array) - 1); - +IFLIB_PNP_INFO(pci, ix_driver, ixgbe_vendor_info_array); MODULE_DEPEND(ix, pci, 1, 1, 1); MODULE_DEPEND(ix, ether, 1, 1, 1); MODULE_DEPEND(ix, iflib, 1, 1, 1); Modified: head/sys/dev/ixgbe/if_ixv.c ============================================================================== --- head/sys/dev/ixgbe/if_ixv.c Thu Oct 11 21:18:51 2018 (r339318) +++ head/sys/dev/ixgbe/if_ixv.c Thu Oct 11 22:27:12 2018 (r339319) @@ -143,8 +143,7 @@ static driver_t ixv_driver = { devclass_t ixv_devclass; DRIVER_MODULE(ixv, pci, ixv_driver, ixv_devclass, 0, 0); -MODULE_PNP_INFO("U16:vendor;U16:device", pci, ixv, ixv_vendor_info_array, - nitems(ixv_vendor_info_array) - 1); +IFLIB_PNP_INFO(pci, ixv_driver, ixv_vendor_info_array); MODULE_DEPEND(ixv, pci, 1, 1, 1); MODULE_DEPEND(ixv, ether, 1, 1, 1); #ifdef DEV_NETMAP From owner-svn-src-head@freebsd.org Thu Oct 11 23:25:15 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2C04810CB581; Thu, 11 Oct 2018 23:25:15 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C8A8F86E67; Thu, 11 Oct 2018 23:25:14 +0000 (UTC) (envelope-from mjg@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BDE41173DB; Thu, 11 Oct 2018 23:25:14 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9BNPETZ098857; Thu, 11 Oct 2018 23:25:14 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9BNPErQ098856; Thu, 11 Oct 2018 23:25:14 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201810112325.w9BNPErQ098856@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Thu, 11 Oct 2018 23:25:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339320 - head/lib/libmemstat X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/lib/libmemstat X-SVN-Commit-Revision: 339320 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.27 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: Thu, 11 Oct 2018 23:25:15 -0000 Author: mjg Date: Thu Oct 11 23:25:14 2018 New Revision: 339320 URL: https://svnweb.freebsd.org/changeset/base/339320 Log: libmemstat: adjust for per-cpu stats after r338899 Reported by: yuripv Reviewed by: kib, markj Approved by: re (gjb) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D17490 Modified: head/lib/libmemstat/memstat_malloc.c Modified: head/lib/libmemstat/memstat_malloc.c ============================================================================== --- head/lib/libmemstat/memstat_malloc.c Thu Oct 11 22:27:12 2018 (r339319) +++ head/lib/libmemstat/memstat_malloc.c Thu Oct 11 23:25:14 2018 (r339320) @@ -279,15 +279,28 @@ kread_symbol(kvm_t *kvm, int index, void *address, siz return (0); } +static int +kread_zpcpu(kvm_t *kvm, u_long base, void *buf, size_t size, int cpu) +{ + ssize_t ret; + + ret = kvm_read_zpcpu(kvm, base, buf, size, cpu); + if (ret < 0) + return (MEMSTAT_ERROR_KVM); + if ((size_t)ret != size) + return (MEMSTAT_ERROR_KVM_SHORTREAD); + return (0); +} + int memstat_kvm_malloc(struct memory_type_list *list, void *kvm_handle) { struct memory_type *mtp; void *kmemstatistics; - int hint_dontsearch, j, mp_maxcpus, ret; + int hint_dontsearch, j, mp_maxcpus, mp_ncpus, ret; char name[MEMTYPE_MAXNAME]; - struct malloc_type_stats *mts, *mtsp; - struct malloc_type_internal *mtip; + struct malloc_type_stats mts; + struct malloc_type_internal mti, *mtip; struct malloc_type type, *typep; kvm_t *kvm; @@ -320,17 +333,12 @@ memstat_kvm_malloc(struct memory_type_list *list, void return (-1); } - mts = malloc(sizeof(struct malloc_type_stats) * mp_maxcpus); - if (mts == NULL) { - list->mtl_error = MEMSTAT_ERROR_NOMEMORY; - return (-1); - } + mp_ncpus = kvm_getncpus(kvm); for (typep = kmemstatistics; typep != NULL; typep = type.ks_next) { ret = kread(kvm, typep, &type, sizeof(type), 0); if (ret != 0) { _memstat_mtl_empty(list); - free(mts); list->mtl_error = ret; return (-1); } @@ -338,7 +346,6 @@ memstat_kvm_malloc(struct memory_type_list *list, void MEMTYPE_MAXNAME); if (ret != 0) { _memstat_mtl_empty(list); - free(mts); list->mtl_error = ret; return (-1); } @@ -348,11 +355,9 @@ memstat_kvm_malloc(struct memory_type_list *list, void * kernel's, we populate our own array. */ mtip = type.ks_handle; - ret = kread(kvm, mtip->mti_stats, mts, mp_maxcpus * - sizeof(struct malloc_type_stats), 0); + ret = kread(kvm, mtip, &mti, sizeof(mti), 0); if (ret != 0) { _memstat_mtl_empty(list); - free(mts); list->mtl_error = ret; return (-1); } @@ -366,7 +371,6 @@ memstat_kvm_malloc(struct memory_type_list *list, void name, mp_maxcpus); if (mtp == NULL) { _memstat_mtl_empty(list); - free(mts); list->mtl_error = MEMSTAT_ERROR_NOMEMORY; return (-1); } @@ -376,24 +380,34 @@ memstat_kvm_malloc(struct memory_type_list *list, void * be kept in sync. */ _memstat_mt_reset_stats(mtp, mp_maxcpus); - for (j = 0; j < mp_maxcpus; j++) { - mtsp = &mts[j]; - mtp->mt_memalloced += mtsp->mts_memalloced; - mtp->mt_memfreed += mtsp->mts_memfreed; - mtp->mt_numallocs += mtsp->mts_numallocs; - mtp->mt_numfrees += mtsp->mts_numfrees; - mtp->mt_sizemask |= mtsp->mts_size; + for (j = 0; j < mp_ncpus; j++) { + ret = kread_zpcpu(kvm, (u_long)mti.mti_stats, &mts, + sizeof(mts), j); + if (ret != 0) { + _memstat_mtl_empty(list); + list->mtl_error = ret; + return (-1); + } + mtp->mt_memalloced += mts.mts_memalloced; + mtp->mt_memfreed += mts.mts_memfreed; + mtp->mt_numallocs += mts.mts_numallocs; + mtp->mt_numfrees += mts.mts_numfrees; + mtp->mt_sizemask |= mts.mts_size; mtp->mt_percpu_alloc[j].mtp_memalloced = - mtsp->mts_memalloced; + mts.mts_memalloced; mtp->mt_percpu_alloc[j].mtp_memfreed = - mtsp->mts_memfreed; + mts.mts_memfreed; mtp->mt_percpu_alloc[j].mtp_numallocs = - mtsp->mts_numallocs; + mts.mts_numallocs; mtp->mt_percpu_alloc[j].mtp_numfrees = - mtsp->mts_numfrees; + mts.mts_numfrees; mtp->mt_percpu_alloc[j].mtp_sizemask = - mtsp->mts_size; + mts.mts_size; + } + for (; j < mp_maxcpus; j++) { + bzero(&mtp->mt_percpu_alloc[j], + sizeof(mtp->mt_percpu_alloc[0])); } mtp->mt_bytes = mtp->mt_memalloced - mtp->mt_memfreed; From owner-svn-src-head@freebsd.org Thu Oct 11 23:28:06 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 11E1B10CB620; Thu, 11 Oct 2018 23:28:06 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B963786FF5; Thu, 11 Oct 2018 23:28:05 +0000 (UTC) (envelope-from mjg@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AE381173E0; Thu, 11 Oct 2018 23:28:05 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9BNS5EY099018; Thu, 11 Oct 2018 23:28:05 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9BNS4Er099012; Thu, 11 Oct 2018 23:28:04 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201810112328.w9BNS4Er099012@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Thu, 11 Oct 2018 23:28:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339321 - in head/sys: amd64/include conf kern sys x86/x86 x86/xen X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys: amd64/include conf kern sys x86/x86 x86/xen X-SVN-Commit-Revision: 339321 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.27 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: Thu, 11 Oct 2018 23:28:06 -0000 Author: mjg Date: Thu Oct 11 23:28:04 2018 New Revision: 339321 URL: https://svnweb.freebsd.org/changeset/base/339321 Log: Provide string functions for use before ifuncs get resolved. The change is a no-op for architectures which don't ifunc memset, memcpy nor memmove. Convert places which need them. Xen bits by royger. Reviewed by: kib Approved by: re (gjb) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D17487 Modified: head/sys/amd64/include/cpu.h head/sys/conf/files head/sys/kern/link_elf.c head/sys/sys/systm.h head/sys/x86/x86/ucode.c head/sys/x86/xen/pv.c Modified: head/sys/amd64/include/cpu.h ============================================================================== --- head/sys/amd64/include/cpu.h Thu Oct 11 23:25:14 2018 (r339320) +++ head/sys/amd64/include/cpu.h Thu Oct 11 23:28:04 2018 (r339321) @@ -92,6 +92,10 @@ get_cyclecount(void) return (rdtsc()); } +#define MEMSET_EARLY_FUNC memset_std +#define MEMCPY_EARLY_FUNC memcpy_std +#define MEMMOVE_EARLY_FUNC memmove_std + #endif #endif /* !_MACHINE_CPU_H_ */ Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Thu Oct 11 23:25:14 2018 (r339320) +++ head/sys/conf/files Thu Oct 11 23:28:04 2018 (r339321) @@ -3876,6 +3876,7 @@ kern/subr_compressor.c standard \ kern/subr_counter.c standard kern/subr_devstat.c standard kern/subr_disk.c standard +kern/subr_early.c standard kern/subr_epoch.c standard kern/subr_eventhandler.c standard kern/subr_fattime.c standard Modified: head/sys/kern/link_elf.c ============================================================================== --- head/sys/kern/link_elf.c Thu Oct 11 23:25:14 2018 (r339320) +++ head/sys/kern/link_elf.c Thu Oct 11 23:28:04 2018 (r339321) @@ -1682,14 +1682,10 @@ link_elf_ireloc(caddr_t kmdp) { struct elf_file eff; elf_file_t ef; - volatile char *c; - size_t i; ef = &eff; - /* Do not use bzero/memset before ireloc is done. */ - for (c = (char *)ef, i = 0; i < sizeof(*ef); i++) - c[i] = 0; + bzero_early(ef, sizeof(*ef)); ef->modptr = kmdp; ef->dynamic = (Elf_Dyn *)&_DYNAMIC; Modified: head/sys/sys/systm.h ============================================================================== --- head/sys/sys/systm.h Thu Oct 11 23:25:14 2018 (r339320) +++ head/sys/sys/systm.h Thu Oct 11 23:28:04 2018 (r339321) @@ -324,6 +324,12 @@ void *memmove(void * _Nonnull dest, const void * _Nonn int memcmp(const void *b1, const void *b2, size_t len); #define memcmp(b1, b2, len) __builtin_memcmp((b1), (b2), (len)) +void *memset_early(void * _Nonnull buf, int c, size_t len); +#define bzero_early(buf, len) memset_early((buf), 0, (len)) +void *memcpy_early(void * _Nonnull to, const void * _Nonnull from, size_t len); +void *memmove_early(void * _Nonnull dest, const void * _Nonnull src, size_t n); +#define bcopy_early(from, to, len) memmove_early((to), (from), (len)) + int copystr(const void * _Nonnull __restrict kfaddr, void * _Nonnull __restrict kdaddr, size_t len, size_t * __restrict lencopied); Modified: head/sys/x86/x86/ucode.c ============================================================================== --- head/sys/x86/x86/ucode.c Thu Oct 11 23:25:14 2018 (r339320) +++ head/sys/x86/x86/ucode.c Thu Oct 11 23:28:04 2018 (r339321) @@ -355,8 +355,7 @@ ucode_load_bsp(uintptr_t free) if (match != NULL) { addr = map_ucode(free, len); /* We can't use memcpy() before ifunc resolution. */ - for (i = 0; i < len; i++) - addr[i] = ((volatile uint8_t *)match)[i]; + memcpy_early(addr, match, len); match = addr; error = ucode_loader->load(match, false, &nrev, &orev); Modified: head/sys/x86/xen/pv.c ============================================================================== --- head/sys/x86/xen/pv.c Thu Oct 11 23:25:14 2018 (r339320) +++ head/sys/x86/xen/pv.c Thu Oct 11 23:28:04 2018 (r339321) @@ -259,7 +259,7 @@ hammer_time_xen_legacy(start_info_t *si, uint64_t xens */ kenv = (void *)(physfree + KERNBASE); physfree += PAGE_SIZE; - bzero(kenv, PAGE_SIZE); + bzero_early(kenv, PAGE_SIZE); init_static_kenv(kenv, PAGE_SIZE); /* Set the hooks for early functions that diverge from bare metal */ @@ -320,7 +320,7 @@ hammer_time_xen(vm_paddr_t start_info_paddr) */ kenv = (void *)(physfree + KERNBASE); physfree += PAGE_SIZE; - bzero(kenv, PAGE_SIZE); + bzero_early(kenv, PAGE_SIZE); init_static_kenv(kenv, PAGE_SIZE); if (start_info->modlist_paddr != 0) { From owner-svn-src-head@freebsd.org Thu Oct 11 23:37:58 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 94EBA10CB8FA; Thu, 11 Oct 2018 23:37:58 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3EE7F874D4; Thu, 11 Oct 2018 23:37:58 +0000 (UTC) (envelope-from mjg@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 34CC81757E; Thu, 11 Oct 2018 23:37:58 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9BNbwjo004025; Thu, 11 Oct 2018 23:37:58 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9BNbwP8004024; Thu, 11 Oct 2018 23:37:58 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201810112337.w9BNbwP8004024@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Thu, 11 Oct 2018 23:37:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339322 - head/sys/amd64/amd64 X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/amd64/amd64 X-SVN-Commit-Revision: 339322 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.27 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: Thu, 11 Oct 2018 23:37:58 -0000 Author: mjg Date: Thu Oct 11 23:37:57 2018 New Revision: 339322 URL: https://svnweb.freebsd.org/changeset/base/339322 Log: amd64: make memmove and memcpy less slow with mov The reasoning is the same as with the memset change, see r339205 Reviewed by: kib (previous version) Approved by: re (gjb) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D17441 Modified: head/sys/amd64/amd64/support.S Modified: head/sys/amd64/amd64/support.S ============================================================================== --- head/sys/amd64/amd64/support.S Thu Oct 11 23:28:04 2018 (r339321) +++ head/sys/amd64/amd64/support.S Thu Oct 11 23:37:57 2018 (r339322) @@ -200,82 +200,236 @@ END(memcmp) * Adapted from bcopy written by: * ws@tools.de (Wolfgang Solfrank, TooLs GmbH) +49-228-985800 */ -ENTRY(memmove_std) - PUSH_FRAME_POINTER - movq %rdi,%rax - movq %rdx,%rcx +/* + * Register state at entry is supposed to be as follows: + * rdi - destination + * rsi - source + * rdx - count + * + * The macro possibly clobbers the above and: rcx, r8. + * It does not clobber rax, r10 nor r11. + */ +.macro MEMMOVE erms overlap begin end + \begin +.if \overlap == 1 movq %rdi,%r8 subq %rsi,%r8 - cmpq %rcx,%r8 /* overlapping && src < dst? */ + cmpq %rcx,%r8 /* overlapping && src < dst? */ jb 2f +.endif - cmpq $15,%rcx - jbe 1f - shrq $3,%rcx /* copy by 64-bit words */ - rep - movsq - movq %rdx,%rcx - andq $7,%rcx /* any bytes left? */ - jne 1f - POP_FRAME_POINTER + cmpq $32,%rcx + jb 1016f + + cmpq $256,%rcx + ja 1256f + +1032: + movq (%rsi),%rdx + movq %rdx,(%rdi) + movq 8(%rsi),%rdx + movq %rdx,8(%rdi) + movq 16(%rsi),%rdx + movq %rdx,16(%rdi) + movq 24(%rsi),%rdx + movq %rdx,24(%rdi) + leaq 32(%rsi),%rsi + leaq 32(%rdi),%rdi + subq $32,%rcx + cmpq $32,%rcx + jae 1032b + cmpb $0,%cl + jne 1016f + \end ret ALIGN_TEXT -1: +1016: + cmpb $16,%cl + jl 1008f + movq (%rsi),%rdx + movq %rdx,(%rdi) + movq 8(%rsi),%rdx + movq %rdx,8(%rdi) + subb $16,%cl + jz 1000f + leaq 16(%rsi),%rsi + leaq 16(%rdi),%rdi +1008: + cmpb $8,%cl + jl 1004f + movq (%rsi),%rdx + movq %rdx,(%rdi) + subb $8,%cl + jz 1000f + leaq 8(%rsi),%rsi + leaq 8(%rdi),%rdi +1004: + cmpb $4,%cl + jl 1002f + movl (%rsi),%edx + movl %edx,(%rdi) + subb $4,%cl + jz 1000f + leaq 4(%rsi),%rsi + leaq 4(%rdi),%rdi +1002: + cmpb $2,%cl + jl 1001f + movw (%rsi),%dx + movw %dx,(%rdi) + subb $2,%cl + jz 1000f + leaq 2(%rsi),%rsi + leaq 2(%rdi),%rdi +1001: + cmpb $1,%cl + jl 1000f + movb (%rsi),%dl + movb %dl,(%rdi) +1000: + \end + ret + + ALIGN_TEXT +1256: +.if \erms == 1 rep movsb - POP_FRAME_POINTER +.else + shrq $3,%rcx /* copy by 64-bit words */ + rep + movsq + movq %rdx,%rcx + andb $7,%cl /* any bytes left? */ + jne 1004b +.endif + \end ret - /* ALIGN_TEXT */ +.if \overlap == 1 + /* + * Copy backwards. + */ + ALIGN_TEXT 2: - addq %rcx,%rdi /* copy backwards */ + addq %rcx,%rdi addq %rcx,%rsi + + cmpq $32,%rcx + jb 2016f + + cmpq $256,%rcx + ja 2256f + +2032: + movq -8(%rsi),%rdx + movq %rdx,-8(%rdi) + movq -16(%rsi),%rdx + movq %rdx,-16(%rdi) + movq -24(%rsi),%rdx + movq %rdx,-24(%rdi) + movq -32(%rsi),%rdx + movq %rdx,-32(%rdi) + leaq -32(%rsi),%rsi + leaq -32(%rdi),%rdi + subq $32,%rcx + cmpq $32,%rcx + jae 2032b + cmpb $0,%cl + jne 2016f + \end + ret + ALIGN_TEXT +2016: + cmpb $16,%cl + jl 2008f + movq -8(%rsi),%rdx + movq %rdx,-8(%rdi) + movq -16(%rsi),%rdx + movq %rdx,-16(%rdi) + subb $16,%cl + jz 2000f + leaq -16(%rsi),%rsi + leaq -16(%rdi),%rdi +2008: + cmpb $8,%cl + jl 2004f + movq -8(%rsi),%rdx + movq %rdx,-8(%rdi) + subb $8,%cl + jz 2000f + leaq -8(%rsi),%rsi + leaq -8(%rdi),%rdi +2004: + cmpb $4,%cl + jl 2002f + movl -4(%rsi),%edx + movl %edx,-4(%rdi) + subb $4,%cl + jz 2000f + leaq -4(%rsi),%rsi + leaq -4(%rdi),%rdi +2002: + cmpb $2,%cl + jl 2001f + movw -2(%rsi),%dx + movw %dx,-2(%rdi) + subb $2,%cl + jz 2000f + leaq -2(%rsi),%rsi + leaq -2(%rdi),%rdi +2001: + cmpb $1,%cl + jl 2000f + movb -1(%rsi),%dl + movb %dl,-1(%rdi) +2000: + \end + ret + ALIGN_TEXT +2256: decq %rdi decq %rsi std - andq $7,%rcx /* any fractional bytes? */ +.if \erms == 1 + rep + movsb +.else + andq $7,%rcx /* any fractional bytes? */ je 3f rep movsb 3: - movq %rdx,%rcx /* copy remainder by 32-bit words */ + movq %rdx,%rcx /* copy remainder by 32-bit words */ shrq $3,%rcx subq $7,%rsi subq $7,%rdi rep movsq +.endif cld - POP_FRAME_POINTER + \end ret -END(memmove_std) +.endif +.endm -ENTRY(memmove_erms) +.macro MEMMOVE_BEGIN PUSH_FRAME_POINTER movq %rdi,%rax movq %rdx,%rcx +.endm - movq %rdi,%r8 - subq %rsi,%r8 - cmpq %rcx,%r8 /* overlapping && src < dst? */ - jb 1f - - rep - movsb +.macro MEMMOVE_END POP_FRAME_POINTER - ret +.endm -1: - addq %rcx,%rdi /* copy backwards */ - addq %rcx,%rsi - decq %rdi - decq %rsi - std - rep - movsb - cld - POP_FRAME_POINTER - ret +ENTRY(memmove_std) + MEMMOVE erms=0 overlap=1 begin=MEMMOVE_BEGIN end=MEMMOVE_END +END(memmove_std) + +ENTRY(memmove_erms) + MEMMOVE erms=1 overlap=1 begin=MEMMOVE_BEGIN end=MEMMOVE_END END(memmove_erms) /* @@ -285,35 +439,11 @@ END(memmove_erms) * Note: memcpy does not support overlapping copies */ ENTRY(memcpy_std) - PUSH_FRAME_POINTER - movq %rdi,%rax - movq %rdx,%rcx - cmpq $15,%rcx - jbe 1f - shrq $3,%rcx /* copy by 64-bit words */ - rep - movsq - movq %rdx,%rcx - andq $7,%rcx /* any bytes left? */ - jne 1f - POP_FRAME_POINTER - ret - ALIGN_TEXT -1: - rep - movsb - POP_FRAME_POINTER - ret + MEMMOVE erms=0 overlap=0 begin=MEMMOVE_BEGIN end=MEMMOVE_END END(memcpy_std) ENTRY(memcpy_erms) - PUSH_FRAME_POINTER - movq %rdi,%rax - movq %rdx,%rcx - rep - movsb - POP_FRAME_POINTER - ret + MEMMOVE erms=1 overlap=0 begin=MEMMOVE_BEGIN end=MEMMOVE_END END(memcpy_erms) /* From owner-svn-src-head@freebsd.org Fri Oct 12 00:32:46 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E39C310CCFB9; Fri, 12 Oct 2018 00:32:45 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 996E08A0C2; Fri, 12 Oct 2018 00:32:45 +0000 (UTC) (envelope-from mjg@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9418517F70; Fri, 12 Oct 2018 00:32:45 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9C0Wj1q035512; Fri, 12 Oct 2018 00:32:45 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9C0WjdZ035511; Fri, 12 Oct 2018 00:32:45 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201810120032.w9C0WjdZ035511@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Fri, 12 Oct 2018 00:32:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339323 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 339323 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.27 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, 12 Oct 2018 00:32:46 -0000 Author: mjg Date: Fri Oct 12 00:32:45 2018 New Revision: 339323 URL: https://svnweb.freebsd.org/changeset/base/339323 Log: Add a file missed in r339321 Approved by: re (implicit) Sad face: mjg Added: head/sys/kern/subr_early.c (contents, props changed) Added: head/sys/kern/subr_early.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/kern/subr_early.c Fri Oct 12 00:32:45 2018 (r339323) @@ -0,0 +1,76 @@ +/*- + * Copyright (c) 2018 The FreeBSD Foundation + * + * This software was developed by Mateusz Guzik + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include + +#ifndef MEMSET_EARLY_FUNC +#define MEMSET_EARLY_FUNC memset +#else +void *MEMSET_EARLY_FUNC(void *, int, size_t); +#endif + +void * +memset_early(void *buf, int c, size_t len) +{ + + return (MEMSET_EARLY_FUNC(buf, c, len)); +} + +#ifndef MEMCPY_EARLY_FUNC +#define MEMCPY_EARLY_FUNC memcpy +#else +void *MEMCPY_EARLY_FUNC(void *, const void *, size_t); +#endif + +void * +memcpy_early(void *to, const void *from, size_t len) +{ + + return (MEMCPY_EARLY_FUNC(to, from, len)); +} + +#ifndef MEMMOVE_EARLY_FUNC +#define MEMMOVE_EARLY_FUNC memmove +#else +void *MEMMOVE_EARLY_FUNC(void *, const void *, size_t); +#endif + +void * +memmove_early(void *to, const void *from, size_t len) +{ + + return (MEMMOVE_EARLY_FUNC(to, from, len)); +} From owner-svn-src-head@freebsd.org Fri Oct 12 05:27:59 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6B51B10D3591; Fri, 12 Oct 2018 05:27:59 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 106EE724E6; Fri, 12 Oct 2018 05:27:59 +0000 (UTC) (envelope-from des@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 05A481AF8A; Fri, 12 Oct 2018 05:27:59 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9C5RwVp085579; Fri, 12 Oct 2018 05:27:58 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9C5Rw2D085578; Fri, 12 Oct 2018 05:27:58 GMT (envelope-from des@FreeBSD.org) Message-Id: <201810120527.w9C5Rw2D085578@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Fri, 12 Oct 2018 05:27:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339325 - in head: lib/libldns share/mk X-SVN-Group: head X-SVN-Commit-Author: des X-SVN-Commit-Paths: in head: lib/libldns share/mk X-SVN-Commit-Revision: 339325 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.27 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, 12 Oct 2018 05:27:59 -0000 Author: des Date: Fri Oct 12 05:27:58 2018 New Revision: 339325 URL: https://svnweb.freebsd.org/changeset/base/339325 Log: Add libssl to libldns for DANE. Approved by: re (gjb) Modified: head/lib/libldns/Makefile head/share/mk/src.libnames.mk Modified: head/lib/libldns/Makefile ============================================================================== --- head/lib/libldns/Makefile Fri Oct 12 01:11:20 2018 (r339324) +++ head/lib/libldns/Makefile Fri Oct 12 05:27:58 2018 (r339325) @@ -19,7 +19,7 @@ SRCS= buffer.c dane.c dname.c dnssec.c dnssec_sign.c d SRCS+= b64_ntop.c b64_pton.c -LIBADD= crypto +LIBADD= ssl crypto WARNS ?= 3 Modified: head/share/mk/src.libnames.mk ============================================================================== --- head/share/mk/src.libnames.mk Fri Oct 12 01:11:20 2018 (r339324) +++ head/share/mk/src.libnames.mk Fri Oct 12 05:27:58 2018 (r339325) @@ -273,7 +273,7 @@ _DP_mp= crypto _DP_memstat= kvm _DP_magic= z _DP_mt= sbuf bsdxml -_DP_ldns= crypto +_DP_ldns= ssl crypto .if ${MK_OPENSSL} != "no" _DP_fetch= ssl crypto .else From owner-svn-src-head@freebsd.org Fri Oct 12 05:42:39 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0845310D3CE7; Fri, 12 Oct 2018 05:42:39 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B34E6730A6; Fri, 12 Oct 2018 05:42:38 +0000 (UTC) (envelope-from des@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AE3991B2DC; Fri, 12 Oct 2018 05:42:38 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9C5gcHv095392; Fri, 12 Oct 2018 05:42:38 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9C5gcW0095391; Fri, 12 Oct 2018 05:42:38 GMT (envelope-from des@FreeBSD.org) Message-Id: <201810120542.w9C5gcW0095391@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Fri, 12 Oct 2018 05:42:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339326 - head X-SVN-Group: head X-SVN-Commit-Author: des X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 339326 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.27 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, 12 Oct 2018 05:42:39 -0000 Author: des Date: Fri Oct 12 05:42:38 2018 New Revision: 339326 URL: https://svnweb.freebsd.org/changeset/base/339326 Log: Move libssl up in the bootstrap order. Submitted by: jkim Approved by: re (gjb) Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Fri Oct 12 05:27:58 2018 (r339325) +++ head/Makefile.inc1 Fri Oct 12 05:42:38 2018 (r339326) @@ -2534,8 +2534,8 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ ${_cddl_lib_libctf} \ lib/libufs \ lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \ - ${_secure_lib_libcrypto} ${_lib_libldns} \ - ${_secure_lib_libssh} ${_secure_lib_libssl} + ${_secure_lib_libcrypto} ${_secure_lib_libssl} \ + ${_lib_libldns} ${_secure_lib_libssh} .if ${MK_GNUCXX} != "no" _prebuild_libs+= gnu/lib/libstdc++ gnu/lib/libsupc++ From owner-svn-src-head@freebsd.org Fri Oct 12 11:30:46 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B9D3410B8475; Fri, 12 Oct 2018 11:30:46 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6FDD47D955; Fri, 12 Oct 2018 11:30:46 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6AF471EB38; Fri, 12 Oct 2018 11:30:46 +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 w9CBUkk2074558; Fri, 12 Oct 2018 11:30:46 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9CBUkxW074557; Fri, 12 Oct 2018 11:30:46 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201810121130.w9CBUkxW074557@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Fri, 12 Oct 2018 11:30:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339327 - head/sys/netinet X-SVN-Group: head X-SVN-Commit-Author: bz X-SVN-Commit-Paths: head/sys/netinet X-SVN-Commit-Revision: 339327 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.27 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, 12 Oct 2018 11:30:46 -0000 Author: bz Date: Fri Oct 12 11:30:46 2018 New Revision: 339327 URL: https://svnweb.freebsd.org/changeset/base/339327 Log: r217592 moved the check for imo in udp_input() into the conditional block but leaving the variable assignment outside the block, where it is no longer used. Move both the variable and the assignment one block further in. This should result in no functional changes. It will however make upcoming changes slightly easier to apply. Reviewed by: markj, jtl, tuexen Approved by: re (kib) Differential Revision: https://reviews.freebsd.org/D17525 Modified: head/sys/netinet/udp_usrreq.c Modified: head/sys/netinet/udp_usrreq.c ============================================================================== --- head/sys/netinet/udp_usrreq.c Fri Oct 12 05:42:38 2018 (r339326) +++ head/sys/netinet/udp_usrreq.c Fri Oct 12 11:30:46 2018 (r339327) @@ -528,7 +528,6 @@ udp_input(struct mbuf **mp, int *offp, int proto) in_broadcast(ip->ip_dst, ifp)) { struct inpcb *last; struct inpcbhead *pcblist; - struct ip_moptions *imo; INP_INFO_RLOCK_ET(pcbinfo, et); pcblist = udp_get_pcblist(proto); @@ -563,10 +562,12 @@ udp_input(struct mbuf **mp, int *offp, int proto) * Handle socket delivery policy for any-source * and source-specific multicast. [RFC3678] */ - imo = inp->inp_moptions; if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr))) { + struct ip_moptions *imo; struct sockaddr_in group; int blocked; + + imo = inp->inp_moptions; if (imo == NULL) { INP_RUNLOCK(inp); continue; From owner-svn-src-head@freebsd.org Fri Oct 12 11:34:02 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6F56510B86F3; Fri, 12 Oct 2018 11:34:02 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 236697DD8F; Fri, 12 Oct 2018 11:34:02 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id CA9AF1D21E; Fri, 12 Oct 2018 11:34:01 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-lf1-f46.google.com with SMTP id q39-v6so9079947lfi.8; Fri, 12 Oct 2018 04:34:01 -0700 (PDT) X-Gm-Message-State: ABuFfojfJnAeiykeE9hobOSRQwckqVmm2mlVNNoZn4ZtWYRwILqH73z1 HGS6/Lvv0juRP5fHB803Jh0Zh/svecOV34sQ64Q= X-Google-Smtp-Source: ACcGV62mmqkfMnvVqw2DfnqEObiOubI0u1b0ZbssP3k1Il7TzEDaYu1ZBFwcrk9AX28/PKHPYgT+Zr8W2aa8JasCfRc= X-Received: by 2002:a19:59d3:: with SMTP id n202-v6mr3633180lfb.125.1539344040211; Fri, 12 Oct 2018 04:34:00 -0700 (PDT) MIME-Version: 1.0 References: <201810120542.w9C5gcW0095391@repo.freebsd.org> In-Reply-To: <201810120542.w9C5gcW0095391@repo.freebsd.org> From: Kyle Evans Date: Fri, 12 Oct 2018 06:33:48 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r339326 - head To: =?UTF-8?Q?Dag=2DErling_Sm=C3=B8rgrav?= Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 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, 12 Oct 2018 11:34:02 -0000 On Fri, Oct 12, 2018 at 12:43 AM Dag-Erling Sm=C3=B8rgrav = wrote: > > Author: des > Date: Fri Oct 12 05:42:38 2018 > New Revision: 339326 > URL: https://svnweb.freebsd.org/changeset/base/339326 > > Log: > Move libssl up in the bootstrap order. > > Submitted by: jkim > Approved by: re (gjb) > > Modified: > head/Makefile.inc1 > > Modified: head/Makefile.inc1 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/Makefile.inc1 Fri Oct 12 05:27:58 2018 (r339325) > +++ head/Makefile.inc1 Fri Oct 12 05:42:38 2018 (r339326) > @@ -2534,8 +2534,8 @@ _prebuild_libs=3D ${_kerberos5_lib_libasn1} \ > ${_cddl_lib_libctf} \ > lib/libufs \ > lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/= msun \ > - ${_secure_lib_libcrypto} ${_lib_libldns} \ > - ${_secure_lib_libssh} ${_secure_lib_libssl} > + ${_secure_lib_libcrypto} ${_secure_lib_libssl} \ > + ${_lib_libldns} ${_secure_lib_libssh} > > .if ${MK_GNUCXX} !=3D "no" > _prebuild_libs+=3D gnu/lib/libstdc++ gnu/lib/libsupc++ > _______________________________________________ Hmm... doesn't this kind of situation also require an __L rule down below to prevent the race, since they're both in prebuild_libs? Thanks, Kyle Evans From owner-svn-src-head@freebsd.org Fri Oct 12 13:01:17 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DE8E910BBE36; Fri, 12 Oct 2018 13:01:17 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 92CF5816A1; Fri, 12 Oct 2018 13:01:17 +0000 (UTC) (envelope-from des@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8DB5D1FA89; Fri, 12 Oct 2018 13:01:17 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9CD1HxV018094; Fri, 12 Oct 2018 13:01:17 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9CD1H0T018093; Fri, 12 Oct 2018 13:01:17 GMT (envelope-from des@FreeBSD.org) Message-Id: <201810121301.w9CD1H0T018093@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Fri, 12 Oct 2018 13:01:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339328 - head X-SVN-Group: head X-SVN-Commit-Author: des X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 339328 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.27 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, 12 Oct 2018 13:01:18 -0000 Author: des Date: Fri Oct 12 13:01:17 2018 New Revision: 339328 URL: https://svnweb.freebsd.org/changeset/base/339328 Log: Replace libldns's bootstrap dependency on libcrypto with one on libssl (which in turn has a bootstrap dependency on libcrypto). Submitted by: jkim Approved by: re (gjb) Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Fri Oct 12 11:30:46 2018 (r339327) +++ head/Makefile.inc1 Fri Oct 12 13:01:17 2018 (r339328) @@ -2631,9 +2631,10 @@ lib/librtld_db__L: lib/libprocstat__L _secure_lib_libcrypto= secure/lib/libcrypto _secure_lib_libssl= secure/lib/libssl lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L +secure/lib/libcrypto__L: lib/libthr__L .if ${MK_LDNS} != "no" _lib_libldns= lib/libldns -lib/libldns__L: secure/lib/libcrypto__L +lib/libldns__L: secure/lib/libssl__L .endif .if ${MK_OPENSSH} != "no" _secure_lib_libssh= secure/lib/libssh From owner-svn-src-head@freebsd.org Fri Oct 12 15:14:23 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 18BBB10C11C6; Fri, 12 Oct 2018 15:14:23 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BD65586E65; Fri, 12 Oct 2018 15:14:22 +0000 (UTC) (envelope-from mav@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B7BFC2119B; Fri, 12 Oct 2018 15:14:22 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9CFEMFU089475; Fri, 12 Oct 2018 15:14:22 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9CFEM96089474; Fri, 12 Oct 2018 15:14:22 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201810121514.w9CFEM96089474@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Fri, 12 Oct 2018 15:14:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339329 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: head X-SVN-Commit-Author: mav X-SVN-Commit-Paths: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Commit-Revision: 339329 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.27 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, 12 Oct 2018 15:14:23 -0000 Author: mav Date: Fri Oct 12 15:14:22 2018 New Revision: 339329 URL: https://svnweb.freebsd.org/changeset/base/339329 Log: Add ZIO_TYPE_FREE support for indirect vdevs. Upstream code expects only ZIO_TYPE_READ and some ZIO_TYPE_WRITE requests to removed (indirect) vdevs, while on FreeBSD there is also ZIO_TYPE_FREE (TRIM). ZIO_TYPE_FREE requests do not have the data buffers, so don't need the pointer adjustment. PR: 228750, 229007 Reviewed by: allanjude, sef Approved by: re (kib) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D17523 Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_indirect.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_indirect.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_indirect.c Fri Oct 12 13:01:17 2018 (r339328) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_indirect.c Fri Oct 12 15:14:22 2018 (r339329) @@ -1147,6 +1147,9 @@ vdev_indirect_child_io_done(zio_t *zio) pio->io_error = zio_worst_error(pio->io_error, zio->io_error); mutex_exit(&pio->io_lock); +#ifdef __FreeBSD__ + if (zio->io_abd != NULL) +#endif abd_put(zio->io_abd); } @@ -1262,8 +1265,12 @@ vdev_indirect_io_start(zio_t *zio) zio->io_vsd_ops = &vdev_indirect_vsd_ops; ASSERT(spa_config_held(spa, SCL_ALL, RW_READER) != 0); +#ifdef __FreeBSD__ + if (zio->io_type == ZIO_TYPE_WRITE) { +#else if (zio->io_type != ZIO_TYPE_READ) { ASSERT3U(zio->io_type, ==, ZIO_TYPE_WRITE); +#endif /* * Note: this code can handle other kinds of writes, * but we don't expect them. @@ -1295,6 +1302,9 @@ vdev_indirect_io_start(zio_t *zio) ASSERT3P(list_next(&iv->iv_splits, first), ==, NULL); zio_nowait(zio_vdev_child_io(zio, zio->io_bp, first->is_vdev, first->is_target_offset, +#ifdef __FreeBSD__ + zio->io_abd == NULL ? NULL : +#endif abd_get_offset(zio->io_abd, 0), zio->io_size, zio->io_type, zio->io_priority, 0, vdev_indirect_child_io_done, zio)); @@ -1321,6 +1331,9 @@ vdev_indirect_io_start(zio_t *zio) is != NULL; is = list_next(&iv->iv_splits, is)) { zio_nowait(zio_vdev_child_io(zio, NULL, is->is_vdev, is->is_target_offset, +#ifdef __FreeBSD__ + zio->io_abd == NULL ? NULL : +#endif abd_get_offset(zio->io_abd, is->is_split_offset), is->is_size, zio->io_type, From owner-svn-src-head@freebsd.org Fri Oct 12 15:19:43 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CB79810C1453; Fri, 12 Oct 2018 15:19:42 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7D79C87513; Fri, 12 Oct 2018 15:19:42 +0000 (UTC) (envelope-from br@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5DC57211BA; Fri, 12 Oct 2018 15:19:42 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9CFJgvX089898; Fri, 12 Oct 2018 15:19:42 GMT (envelope-from br@FreeBSD.org) Received: (from br@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9CFJfYl089894; Fri, 12 Oct 2018 15:19:41 GMT (envelope-from br@FreeBSD.org) Message-Id: <201810121519.w9CFJfYl089894@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org using -f From: Ruslan Bukin Date: Fri, 12 Oct 2018 15:19:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339330 - in head/sys: conf dev/uart riscv/conf X-SVN-Group: head X-SVN-Commit-Author: br X-SVN-Commit-Paths: in head/sys: conf dev/uart riscv/conf X-SVN-Commit-Revision: 339330 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.27 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, 12 Oct 2018 15:19:43 -0000 Author: br Date: Fri Oct 12 15:19:41 2018 New Revision: 339330 URL: https://svnweb.freebsd.org/changeset/base/339330 Log: Add support for the UART device found in lowRISC system-on-a-chip. The only source of documentation for this device is verilog, so driver is minimalistic. Reviewed by: Dr Jonathan Kimmitt Approved by: re (kib) Sponsored by: DARPA, AFRL Added: head/sys/dev/uart/uart_dev_lowrisc.c (contents, props changed) head/sys/dev/uart/uart_dev_lowrisc.h (contents, props changed) Modified: head/sys/conf/files.riscv head/sys/riscv/conf/GENERIC Modified: head/sys/conf/files.riscv ============================================================================== --- head/sys/conf/files.riscv Fri Oct 12 15:14:22 2018 (r339329) +++ head/sys/conf/files.riscv Fri Oct 12 15:19:41 2018 (r339330) @@ -7,6 +7,7 @@ crypto/blowfish/bf_enc.c optional crypto | ipsec | ips crypto/des/des_enc.c optional crypto | ipsec | ipsec_support | netsmb dev/ofw/ofw_cpu.c optional fdt dev/uart/uart_cpu_fdt.c optional uart fdt +dev/uart/uart_dev_lowrisc.c optional uart_lowrisc dev/xilinx/axi_quad_spi.c optional xilinx_spi kern/kern_clocksource.c standard kern/msi_if.m standard Added: head/sys/dev/uart/uart_dev_lowrisc.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/dev/uart/uart_dev_lowrisc.c Fri Oct 12 15:19:41 2018 (r339330) @@ -0,0 +1,393 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2018 Ruslan Bukin + * All rights reserved. + * + * This software was developed by SRI International and the University of + * Cambridge Computer Laboratory (Department of Computer Science and + * Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the + * DARPA SSITH research programme. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include "opt_ddb.h" + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "uart_if.h" + +#define DEFAULT_BAUD_RATE 115200 + +/* + * Low-level UART interface. + */ +static int lowrisc_uart_probe(struct uart_bas *bas); +static void lowrisc_uart_init(struct uart_bas *bas, int, int, int, int); +static void lowrisc_uart_term(struct uart_bas *bas); +static void lowrisc_uart_putc(struct uart_bas *bas, int); +static int lowrisc_uart_rxready(struct uart_bas *bas); +static int lowrisc_uart_getc(struct uart_bas *bas, struct mtx *); + +static struct uart_ops uart_lowrisc_uart_ops = { + .probe = lowrisc_uart_probe, + .init = lowrisc_uart_init, + .term = lowrisc_uart_term, + .putc = lowrisc_uart_putc, + .rxready = lowrisc_uart_rxready, + .getc = lowrisc_uart_getc, +}; + +static int +lowrisc_uart_probe(struct uart_bas *bas) +{ + + return (0); +} + +static u_int +lowrisc_uart_getbaud(struct uart_bas *bas) +{ + + return (DEFAULT_BAUD_RATE); +} + +static void +lowrisc_uart_init(struct uart_bas *bas, int baudrate, int databits, + int stopbits, int parity) +{ + + /* TODO */ +} + +static void +lowrisc_uart_term(struct uart_bas *bas) +{ + + /* TODO */ +} + +static void +lowrisc_uart_putc(struct uart_bas *bas, int c) +{ + + while (GETREG(bas, UART_DR) & DR_TX_FIFO_FULL) + ; + + SETREG(bas, UART_DR, c); +} + +static int +lowrisc_uart_rxready(struct uart_bas *bas) +{ + + if (GETREG(bas, UART_DR) & DR_RX_FIFO_EMPTY) + return (0); + + return (1); +} + +static int +lowrisc_uart_getc(struct uart_bas *bas, struct mtx *hwmtx) +{ + uint32_t reg; + + uart_lock(hwmtx); + SETREG(bas, UART_INT_STATUS, INT_STATUS_ACK); + reg = GETREG(bas, UART_DR); + uart_unlock(hwmtx); + + return (reg & 0xff); +} + +/* + * High-level UART interface. + */ +struct lowrisc_uart_softc { + struct uart_softc base; +}; + +static int lowrisc_uart_bus_attach(struct uart_softc *); +static int lowrisc_uart_bus_detach(struct uart_softc *); +static int lowrisc_uart_bus_flush(struct uart_softc *, int); +static int lowrisc_uart_bus_getsig(struct uart_softc *); +static int lowrisc_uart_bus_ioctl(struct uart_softc *, int, intptr_t); +static int lowrisc_uart_bus_ipend(struct uart_softc *); +static int lowrisc_uart_bus_param(struct uart_softc *, int, int, int, int); +static int lowrisc_uart_bus_probe(struct uart_softc *); +static int lowrisc_uart_bus_receive(struct uart_softc *); +static int lowrisc_uart_bus_setsig(struct uart_softc *, int); +static int lowrisc_uart_bus_transmit(struct uart_softc *); +static void lowrisc_uart_bus_grab(struct uart_softc *); +static void lowrisc_uart_bus_ungrab(struct uart_softc *); + +static kobj_method_t lowrisc_uart_methods[] = { + KOBJMETHOD(uart_attach, lowrisc_uart_bus_attach), + KOBJMETHOD(uart_detach, lowrisc_uart_bus_detach), + KOBJMETHOD(uart_flush, lowrisc_uart_bus_flush), + KOBJMETHOD(uart_getsig, lowrisc_uart_bus_getsig), + KOBJMETHOD(uart_ioctl, lowrisc_uart_bus_ioctl), + KOBJMETHOD(uart_ipend, lowrisc_uart_bus_ipend), + KOBJMETHOD(uart_param, lowrisc_uart_bus_param), + KOBJMETHOD(uart_probe, lowrisc_uart_bus_probe), + KOBJMETHOD(uart_receive, lowrisc_uart_bus_receive), + KOBJMETHOD(uart_setsig, lowrisc_uart_bus_setsig), + KOBJMETHOD(uart_transmit, lowrisc_uart_bus_transmit), + KOBJMETHOD(uart_grab, lowrisc_uart_bus_grab), + KOBJMETHOD(uart_ungrab, lowrisc_uart_bus_ungrab), + { 0, 0 } +}; + +static struct uart_class uart_lowrisc_class = { + "lowrisc", + lowrisc_uart_methods, + sizeof(struct lowrisc_uart_softc), + .uc_ops = &uart_lowrisc_uart_ops, + .uc_range = 0x100, + .uc_rclk = 12500000, /* TODO: get value from clock manager */ + .uc_rshift = 0 +}; + +static struct ofw_compat_data compat_data[] = { + {"lowrisc-fake", (uintptr_t)&uart_lowrisc_class}, + {NULL, (uintptr_t)NULL}, +}; +UART_FDT_CLASS_AND_DEVICE(compat_data); + +static int +lowrisc_uart_bus_attach(struct uart_softc *sc) +{ + struct uart_bas *bas; + struct uart_devinfo *di; + + bas = &sc->sc_bas; + if (sc->sc_sysdev != NULL) { + di = sc->sc_sysdev; + lowrisc_uart_init(bas, di->baudrate, di->databits, di->stopbits, + di->parity); + } else + lowrisc_uart_init(bas, DEFAULT_BAUD_RATE, 8, 1, 0); + + (void)lowrisc_uart_bus_getsig(sc); + + /* TODO: clear all pending interrupts. */ + + return (0); +} + +static int +lowrisc_uart_bus_detach(struct uart_softc *sc) +{ + + /* TODO */ + + return (0); +} + +static int +lowrisc_uart_bus_flush(struct uart_softc *sc, int what) +{ + + /* TODO */ + + return (0); +} + +static int +lowrisc_uart_bus_getsig(struct uart_softc *sc) +{ + + /* TODO */ + + return (0); +} + +static int +lowrisc_uart_bus_ioctl(struct uart_softc *sc, int request, intptr_t data) +{ + struct uart_bas *bas; + int error; + + bas = &sc->sc_bas; + error = 0; + uart_lock(sc->sc_hwmtx); + switch (request) { + case UART_IOCTL_BREAK: + /* TODO */ + break; + case UART_IOCTL_BAUD: + *(u_int*)data = lowrisc_uart_getbaud(bas); + break; + default: + error = EINVAL; + break; + } + uart_unlock(sc->sc_hwmtx); + + return (error); +} + +static int +lowrisc_uart_bus_ipend(struct uart_softc *sc) +{ + struct uart_bas *bas; + int ipend; + + bas = &sc->sc_bas; + + ipend = 0; + + uart_lock(sc->sc_hwmtx); + if ((GETREG(bas, UART_DR) & DR_RX_FIFO_EMPTY) == 0) + ipend |= SER_INT_RXREADY; + SETREG(bas, UART_INT_STATUS, INT_STATUS_ACK); + uart_unlock(sc->sc_hwmtx); + + return (ipend); +} + +static int +lowrisc_uart_bus_param(struct uart_softc *sc, int baudrate, int databits, + int stopbits, int parity) +{ + + uart_lock(sc->sc_hwmtx); + lowrisc_uart_init(&sc->sc_bas, baudrate, databits, stopbits, parity); + uart_unlock(sc->sc_hwmtx); + + return (0); +} + +static int +lowrisc_uart_bus_probe(struct uart_softc *sc) +{ + int error; + + error = lowrisc_uart_probe(&sc->sc_bas); + if (error) + return (error); + + /* + * On input we can read up to the full fifo size at once. On output, we + * want to write only as much as the programmed tx low water level, + * because that's all we can be certain we have room for in the fifo + * when we get a tx-ready interrupt. + */ + sc->sc_rxfifosz = 2048; + sc->sc_txfifosz = 2048; + + device_set_desc(sc->sc_dev, "lowRISC UART"); + + return (0); +} + +static int +lowrisc_uart_bus_receive(struct uart_softc *sc) +{ + struct uart_bas *bas; + uint32_t reg; + + bas = &sc->sc_bas; + + uart_lock(sc->sc_hwmtx); + + do { + if (uart_rx_full(sc)) { + /* No space left in the input buffer */ + sc->sc_rxbuf[sc->sc_rxput] = UART_STAT_OVERRUN; + break; + } + reg = GETREG(bas, UART_DR); + SETREG(bas, UART_INT_STATUS, INT_STATUS_ACK); + uart_rx_put(sc, reg & 0xff); + } while ((reg & DR_RX_FIFO_EMPTY) == 0); + + uart_unlock(sc->sc_hwmtx); + + return (0); +} + +static int +lowrisc_uart_bus_setsig(struct uart_softc *sc, int sig) +{ + + return (0); +} + +static int +lowrisc_uart_bus_transmit(struct uart_softc *sc) +{ + struct uart_bas *bas; + int i; + + bas = &sc->sc_bas; + + uart_lock(sc->sc_hwmtx); + for (i = 0; i < sc->sc_txdatasz; i++) { + while (GETREG(bas, UART_DR) & DR_TX_FIFO_FULL) + ; + SETREG(bas, UART_DR, sc->sc_txbuf[i] & 0xff); + } + uart_unlock(sc->sc_hwmtx); + + return (0); +} + +static void +lowrisc_uart_bus_grab(struct uart_softc *sc) +{ + struct uart_bas *bas; + + bas = &sc->sc_bas; + + uart_lock(sc->sc_hwmtx); + /* TODO */ + uart_unlock(sc->sc_hwmtx); +} + +static void +lowrisc_uart_bus_ungrab(struct uart_softc *sc) +{ + struct uart_bas *bas; + + bas = &sc->sc_bas; + + uart_lock(sc->sc_hwmtx); + /* TODO */ + uart_unlock(sc->sc_hwmtx); +} Added: head/sys/dev/uart/uart_dev_lowrisc.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/dev/uart/uart_dev_lowrisc.h Fri Oct 12 15:19:41 2018 (r339330) @@ -0,0 +1,66 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2018 Ruslan Bukin + * All rights reserved. + * + * This software was developed by SRI International and the University of + * Cambridge Computer Laboratory (Department of Computer Science and + * Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the + * DARPA SSITH research programme. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _UART_DEV_LOWRISC_H_ +#define _UART_DEV_LOWRISC_H_ + +#define UART_DR 0x0000 +#define DR_DATA_S 0 +#define DR_DATA_M 0xff +#define DR_RX_ERR (1 << 8) +#define DR_RX_FIFO_EMPTY (1 << 9) +#define DR_TX_FIFO_FULL (1 << 10) +#define DR_RX_FIFO_FULL (1 << 11) +#define UART_INT_STATUS 0x1000 +#define INT_STATUS_ACK 1 +#define UART_BAUD 0x2000 /* write-only */ +#define BAUD_115200 108 +#define UART_STAT_RX 0x2000 /* read-only */ +#define STAT_RX_FIFO_RD_COUNT_S 0 +#define STAT_RX_FIFO_RD_COUNT_M (0xffff << STAT_RX_FIFO_RD_COUNT_S) +#define STAT_RX_FIFO_WR_COUNT_S 16 +#define STAT_RX_FIFO_WR_COUNT_M (0xffff << STAT_RX_FIFO_WR_COUNT_S) +#define UART_STAT_TX 0x2004 +#define STAT_TX_FIFO_RD_COUNT_S 0 +#define STAT_TX_FIFO_RD_COUNT_M (0xffff << STAT_TX_FIFO_RD_COUNT_S) +#define STAT_TX_FIFO_WR_COUNT_S 16 +#define STAT_TX_FIFO_WR_COUNT_M (0xffff << STAT_TX_FIFO_WR_COUNT_S) + +#define GETREG(bas, reg) \ + bus_space_read_2((bas)->bst, (bas)->bsh, (reg)) +#define SETREG(bas, reg, value) \ + bus_space_write_2((bas)->bst, (bas)->bsh, (reg), (value)) + +#endif /* _UART_DEV_LOWRISC_H_ */ Modified: head/sys/riscv/conf/GENERIC ============================================================================== --- head/sys/riscv/conf/GENERIC Fri Oct 12 15:14:22 2018 (r339329) +++ head/sys/riscv/conf/GENERIC Fri Oct 12 15:19:41 2018 (r339330) @@ -99,6 +99,7 @@ device virtio_mmio # VirtIO MMIO bus # Serial (COM) ports device uart # Generic UART driver +device uart_lowrisc # lowRISC UART driver device uart_ns8250 # ns8250-type UART driver # Uncomment for memory disk From owner-svn-src-head@freebsd.org Fri Oct 12 15:30:16 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DAE1F10C19E0; Fri, 12 Oct 2018 15:30:15 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8D32F886B2; Fri, 12 Oct 2018 15:30:15 +0000 (UTC) (envelope-from kib@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 82F2F2136D; Fri, 12 Oct 2018 15:30:15 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9CFUFpd095141; Fri, 12 Oct 2018 15:30:15 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9CFUFxa095140; Fri, 12 Oct 2018 15:30:15 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201810121530.w9CFUFxa095140@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Fri, 12 Oct 2018 15:30:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339331 - head/sys/amd64/vmm X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/sys/amd64/vmm X-SVN-Commit-Revision: 339331 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.27 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, 12 Oct 2018 15:30:16 -0000 Author: kib Date: Fri Oct 12 15:30:15 2018 New Revision: 339331 URL: https://svnweb.freebsd.org/changeset/base/339331 Log: bhyve: emulate CLFLUSH and CLFLUSHOPT. Apparently CLFLUSH on mmio can cause VM exit, as reported in the PR. I do not see that anything useful can be done except emulating page faults on invalid addresses. Due to the instruction encoding pecularity, also emulate SFENCE. PR: 232081 Reported by: phk Reviewed by: araujo, avg, jhb (all: previous version) Sponsored by: The FreeBSD Foundation Approved by: re (gjb) MFC after: 1 week Differential revision: https://reviews.freebsd.org/D17482 Modified: head/sys/amd64/vmm/vmm_instruction_emul.c Modified: head/sys/amd64/vmm/vmm_instruction_emul.c ============================================================================== --- head/sys/amd64/vmm/vmm_instruction_emul.c Fri Oct 12 15:19:41 2018 (r339330) +++ head/sys/amd64/vmm/vmm_instruction_emul.c Fri Oct 12 15:30:15 2018 (r339331) @@ -76,6 +76,7 @@ enum { VIE_OP_TYPE_GROUP1, VIE_OP_TYPE_STOS, VIE_OP_TYPE_BITTEST, + VIE_OP_TYPE_TWOB_GRP15, VIE_OP_TYPE_LAST }; @@ -87,6 +88,10 @@ enum { #define VIE_OP_F_NO_GLA_VERIFICATION (1 << 4) static const struct vie_op two_byte_opcodes[256] = { + [0xAE] = { + .op_byte = 0xAE, + .op_type = VIE_OP_TYPE_TWOB_GRP15, + }, [0xB6] = { .op_byte = 0xB6, .op_type = VIE_OP_TYPE_MOVZX, @@ -1443,6 +1448,37 @@ emulate_bittest(void *vm, int vcpuid, uint64_t gpa, st return (0); } +static int +emulate_twob_group15(void *vm, int vcpuid, uint64_t gpa, struct vie *vie, + mem_region_read_t memread, mem_region_write_t memwrite, void *memarg) +{ + int error; + uint64_t buf; + + switch (vie->reg & 7) { + case 0x7: /* CLFLUSH, CLFLUSHOPT, and SFENCE */ + if (vie->mod == 0x3) { + /* + * SFENCE. Ignore it, VM exit provides enough + * barriers on its own. + */ + error = 0; + } else { + /* + * CLFLUSH, CLFLUSHOPT. Only check for access + * rights. + */ + error = memread(vm, vcpuid, gpa, &buf, 1, memarg); + } + break; + default: + error = EINVAL; + break; + } + + return (error); +} + int vmm_emulate_instruction(void *vm, int vcpuid, uint64_t gpa, struct vie *vie, struct vm_guest_paging *paging, mem_region_read_t memread, @@ -1501,6 +1537,10 @@ vmm_emulate_instruction(void *vm, int vcpuid, uint64_t break; case VIE_OP_TYPE_BITTEST: error = emulate_bittest(vm, vcpuid, gpa, vie, + memread, memwrite, memarg); + break; + case VIE_OP_TYPE_TWOB_GRP15: + error = emulate_twob_group15(vm, vcpuid, gpa, vie, memread, memwrite, memarg); break; default: From owner-svn-src-head@freebsd.org Fri Oct 12 15:51:42 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8A76810C2691; Fri, 12 Oct 2018 15:51:42 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 41AF28979C; Fri, 12 Oct 2018 15:51:42 +0000 (UTC) (envelope-from br@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3CA1421818; Fri, 12 Oct 2018 15:51:42 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9CFpgHp009377; Fri, 12 Oct 2018 15:51:42 GMT (envelope-from br@FreeBSD.org) Received: (from br@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9CFpgLC009376; Fri, 12 Oct 2018 15:51:42 GMT (envelope-from br@FreeBSD.org) Message-Id: <201810121551.w9CFpgLC009376@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org using -f From: Ruslan Bukin Date: Fri, 12 Oct 2018 15:51:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339332 - head/sys/riscv/riscv X-SVN-Group: head X-SVN-Commit-Author: br X-SVN-Commit-Paths: head/sys/riscv/riscv X-SVN-Commit-Revision: 339332 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.27 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, 12 Oct 2018 15:51:42 -0000 Author: br Date: Fri Oct 12 15:51:41 2018 New Revision: 339332 URL: https://svnweb.freebsd.org/changeset/base/339332 Log: Initialize interrupt priority to 0 on all sources. Without this hardware raises an interrupt regardless of any pending bits set. This fixes operation on RocketChip and derivatives (e.g. lowRISC). Approved by: re (kib) Sponsored by: DARPA, AFRL Modified: head/sys/riscv/riscv/plic.c Modified: head/sys/riscv/riscv/plic.c ============================================================================== --- head/sys/riscv/riscv/plic.c Fri Oct 12 15:30:15 2018 (r339331) +++ head/sys/riscv/riscv/plic.c Fri Oct 12 15:51:41 2018 (r339332) @@ -218,6 +218,7 @@ plic_attach(device_t dev) if (error != 0) return (error); + WR4(sc, PLIC_PRIORITY(irq), 0); WR4(sc, PLIC_ENABLE(irq, cpu), 0); } WR4(sc, PLIC_THRESHOLD(cpu), 0); From owner-svn-src-head@freebsd.org Fri Oct 12 16:00:22 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1444510C299E; Fri, 12 Oct 2018 16:00:22 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B095989CA2; Fri, 12 Oct 2018 16:00:21 +0000 (UTC) (envelope-from kib@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A5C1821861; Fri, 12 Oct 2018 16:00:21 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9CG0Lxl010724; Fri, 12 Oct 2018 16:00:21 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9CG0LLj010723; Fri, 12 Oct 2018 16:00:21 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201810121600.w9CG0LLj010723@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Fri, 12 Oct 2018 16:00:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339333 - head/sys/amd64/amd64 X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/sys/amd64/amd64 X-SVN-Commit-Revision: 339333 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.27 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, 12 Oct 2018 16:00:22 -0000 Author: kib Date: Fri Oct 12 16:00:21 2018 New Revision: 339333 URL: https://svnweb.freebsd.org/changeset/base/339333 Log: Call initializecpucache() before ifuncs are resolved. The function tweaks CPU capabilities based on the VM platform and tunables, which affected selection of the cache flush method before ifuncs were used, and should affect the cache flush in the same way after ifunc. PR: 232081 Reported by: phk Analyzed by: avg Sponsored by: The FreeBSD Foundation Approved by: re (gjb) Modified: head/sys/amd64/amd64/machdep.c Modified: head/sys/amd64/amd64/machdep.c ============================================================================== --- head/sys/amd64/amd64/machdep.c Fri Oct 12 15:51:41 2018 (r339332) +++ head/sys/amd64/amd64/machdep.c Fri Oct 12 16:00:21 2018 (r339333) @@ -1575,11 +1575,8 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) identify_cpu1(); identify_hypervisor(); - /* - * hw.cpu_stdext_disable is ignored by the call, it will be - * re-evaluted by the below call to finishidentcpu(). - */ identify_cpu2(); + initializecpucache(); /* * Check for pti, pcid, and invpcid before ifuncs are @@ -1727,7 +1724,6 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) finishidentcpu(); /* Final stage of CPU initialization */ initializecpu(); /* Initialize CPU registers */ - initializecpucache(); /* doublefault stack space, runs on ist1 */ common_tss[0].tss_ist1 = (long)&dblfault_stack[sizeof(dblfault_stack)]; From owner-svn-src-head@freebsd.org Fri Oct 12 16:24:50 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9E82810C32A7; Fri, 12 Oct 2018 16:24:50 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 157BC8AE33; Fri, 12 Oct 2018 16:24:50 +0000 (UTC) (envelope-from tsoome@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 033AA21D64; Fri, 12 Oct 2018 16:24:49 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9CGOnVT026092; Fri, 12 Oct 2018 16:24:49 GMT (envelope-from tsoome@FreeBSD.org) Received: (from tsoome@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9CGOnxe026091; Fri, 12 Oct 2018 16:24:49 GMT (envelope-from tsoome@FreeBSD.org) Message-Id: <201810121624.w9CGOnxe026091@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tsoome set sender to tsoome@FreeBSD.org using -f From: Toomas Soome Date: Fri, 12 Oct 2018 16:24:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339334 - head/stand/efi/loader X-SVN-Group: head X-SVN-Commit-Author: tsoome X-SVN-Commit-Paths: head/stand/efi/loader X-SVN-Commit-Revision: 339334 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.27 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, 12 Oct 2018 16:24:50 -0000 Author: tsoome Date: Fri Oct 12 16:24:49 2018 New Revision: 339334 URL: https://svnweb.freebsd.org/changeset/base/339334 Log: loader.efi: add poweroff command Add poweroff command to make life a bit easier. Reviewed by: imp, allanjude Approved by: re (kib) Differential Revision: https://reviews.freebsd.org/D17535 Modified: head/stand/efi/loader/main.c Modified: head/stand/efi/loader/main.c ============================================================================== --- head/stand/efi/loader/main.c Fri Oct 12 16:00:21 2018 (r339333) +++ head/stand/efi/loader/main.c Fri Oct 12 16:24:49 2018 (r339334) @@ -993,6 +993,23 @@ main(int argc, CHAR16 *argv[]) return (EFI_SUCCESS); /* keep compiler happy */ } +COMMAND_SET(poweroff, "poweroff", "power off the system", command_poweroff); + +static int +command_poweroff(int argc __unused, char *argv[] __unused) +{ + int i; + + for (i = 0; devsw[i] != NULL; ++i) + if (devsw[i]->dv_cleanup != NULL) + (devsw[i]->dv_cleanup)(); + + RS->ResetSystem(EfiResetShutdown, EFI_SUCCESS, 0, NULL); + + /* NOTREACHED */ + return (CMD_ERROR); +} + COMMAND_SET(reboot, "reboot", "reboot the system", command_reboot); static int From owner-svn-src-head@freebsd.org Fri Oct 12 16:55:29 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 920A610C3E46; Fri, 12 Oct 2018 16:55:29 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 469068C2D7; Fri, 12 Oct 2018 16:55:29 +0000 (UTC) (envelope-from mav@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 418F42225E; Fri, 12 Oct 2018 16:55:29 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9CGtTbM041174; Fri, 12 Oct 2018 16:55:29 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9CGtT8A041173; Fri, 12 Oct 2018 16:55:29 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201810121655.w9CGtT8A041173@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Fri, 12 Oct 2018 16:55:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339335 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: head X-SVN-Commit-Author: mav X-SVN-Commit-Paths: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Commit-Revision: 339335 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.27 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, 12 Oct 2018 16:55:29 -0000 Author: mav Date: Fri Oct 12 16:55:28 2018 New Revision: 339335 URL: https://svnweb.freebsd.org/changeset/base/339335 Log: Avoid zero-sized kmem_alloc() in vdev_compact_children(). The device evacuation code adds a dependency that vdev_compact_children() be able to properly empty the vdev_child array by setting it to NULL and zeroing vdev_children. Under Linux, kmem_alloc() and related functions return a sentinel pointer rather than NULL for zero-sized allocations. This is a part of ZoL port of device removal patch: commit a1d477c24c7badc89c60955995fd84d311938486 Author: Matthew Ahrens Ported-by: Tim Chase Approved by: re (kib) MFC after: 1 week Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c Fri Oct 12 16:24:49 2018 (r339334) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c Fri Oct 12 16:55:28 2018 (r339335) @@ -505,17 +505,24 @@ vdev_compact_children(vdev_t *pvd) ASSERT(spa_config_held(pvd->vdev_spa, SCL_ALL, RW_WRITER) == SCL_ALL); + if (oldc == 0) + return; + for (int c = newc = 0; c < oldc; c++) if (pvd->vdev_child[c]) newc++; - newchild = kmem_alloc(newc * sizeof (vdev_t *), KM_SLEEP); + if (newc > 0) { + newchild = kmem_alloc(newc * sizeof (vdev_t *), KM_SLEEP); - for (int c = newc = 0; c < oldc; c++) { - if ((cvd = pvd->vdev_child[c]) != NULL) { - newchild[newc] = cvd; - cvd->vdev_id = newc++; + for (int c = newc = 0; c < oldc; c++) { + if ((cvd = pvd->vdev_child[c]) != NULL) { + newchild[newc] = cvd; + cvd->vdev_id = newc++; + } } + } else { + newchild = NULL; } kmem_free(pvd->vdev_child, oldc * sizeof (vdev_t *)); From owner-svn-src-head@freebsd.org Fri Oct 12 21:59:10 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B022E10CC32F; Fri, 12 Oct 2018 21:59:10 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 54DA077C63; Fri, 12 Oct 2018 21:59:10 +0000 (UTC) (envelope-from mjg@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4A259253A6; Fri, 12 Oct 2018 21:59:10 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9CLxA67097614; Fri, 12 Oct 2018 21:59:10 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9CLxAOK097613; Fri, 12 Oct 2018 21:59:10 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201810122159.w9CLxAOK097613@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Fri, 12 Oct 2018 21:59:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339337 - head/sys/amd64/amd64 X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/amd64/amd64 X-SVN-Commit-Revision: 339337 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.27 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, 12 Oct 2018 21:59:10 -0000 Author: mjg Date: Fri Oct 12 21:59:09 2018 New Revision: 339337 URL: https://svnweb.freebsd.org/changeset/base/339337 Log: amd64: employ MEMMOVE in copyin/copyout See r339205 for justification. Reviewed by: kib Approved by: re (gjb) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D17526 Modified: head/sys/amd64/amd64/support.S Modified: head/sys/amd64/amd64/support.S ============================================================================== --- head/sys/amd64/amd64/support.S Fri Oct 12 19:44:19 2018 (r339336) +++ head/sys/amd64/amd64/support.S Fri Oct 12 21:59:09 2018 (r339337) @@ -576,14 +576,27 @@ END(fillw) .endif .endm +.macro COPYINOUT_BEGIN +.endm + +.macro COPYINOUT_END + movq %rax,PCB_ONFAULT(%r11) + POP_FRAME_POINTER +.endm + +.macro COPYINOUT_SMAP_END + SMAP_ENABLE smap=1 + COPYINOUT_END +.endm + /* * copyout(from_kernel, to_user, len) * %rdi, %rsi, %rdx */ .macro COPYOUT smap erms PUSH_FRAME_POINTER - movq PCPU(CURPCB),%r9 - movq $copy_fault,PCB_ONFAULT(%r9) + movq PCPU(CURPCB),%r11 + movq $copy_fault,PCB_ONFAULT(%r11) /* * Check explicitly for non-user addresses. If 486 write protection @@ -609,43 +622,27 @@ END(fillw) ja copy_fault /* - * Set up arguments for rep movs*. + * Set return value to zero. Remaining failure mode goes through + * copy_fault. */ + xorl %eax,%eax + + /* + * Set up arguments for MEMMOVE. + */ movq %rdi,%r8 movq %rsi,%rdi movq %r8,%rsi movq %rdx,%rcx - /* - * Set return value to zero. Remaining failure mode goes through - * copy_fault. - */ - xorl %eax,%eax SMAP_DISABLE \smap -.if \erms == 0 - cmpq $15,%rcx - jbe 1f - shrq $3,%rcx - rep - movsq - movb %dl,%cl - andb $7,%cl - jne 1f - SMAP_ENABLE \smap - movq %rax,PCB_ONFAULT(%r9) - POP_FRAME_POINTER - ret - ALIGN_TEXT -1: +.if \smap == 1 + MEMMOVE erms=\erms overlap=0 begin=COPYINOUT_BEGIN end=COPYINOUT_SMAP_END +.else + MEMMOVE erms=\erms overlap=0 begin=COPYINOUT_BEGIN end=COPYINOUT_END .endif - rep - movsb - - SMAP_ENABLE \smap - movq %rax,PCB_ONFAULT(%r9) - POP_FRAME_POINTER - ret + /* NOTREACHED */ .endm ENTRY(copyout_nosmap_std) @@ -670,8 +667,8 @@ END(copyout_smap_erms) */ .macro COPYIN smap erms PUSH_FRAME_POINTER - movq PCPU(CURPCB),%r9 - movq $copy_fault,PCB_ONFAULT(%r9) + movq PCPU(CURPCB),%r11 + movq $copy_fault,PCB_ONFAULT(%r11) /* * make sure address is valid @@ -683,37 +680,20 @@ END(copyout_smap_erms) cmpq %rcx,%rax ja copy_fault + xorl %eax,%eax + movq %rdi,%r8 movq %rsi,%rdi movq %r8,%rsi movq %rdx,%rcx - xorl %eax,%eax - SMAP_DISABLE \smap -.if \erms == 0 - cmpq $15,%rcx - jbe 1f - shrq $3,%rcx /* copy longword-wise */ - rep - movsq - movb %dl,%cl - andb $7,%cl /* copy remaining bytes */ - jne 1f - SMAP_ENABLE \smap - movq %rax,PCB_ONFAULT(%r9) - POP_FRAME_POINTER - ret - ALIGN_TEXT -1: +.if \smap == 1 + MEMMOVE erms=\erms overlap=0 begin=COPYINOUT_BEGIN end=COPYINOUT_SMAP_END +.else + MEMMOVE erms=\erms overlap=0 begin=COPYINOUT_BEGIN end=COPYINOUT_END .endif - rep - movsb - - SMAP_ENABLE \smap - movq %rax,PCB_ONFAULT(%r9) - POP_FRAME_POINTER - ret + /* NOTREACHED */ .endm ENTRY(copyin_nosmap_std) @@ -735,7 +715,7 @@ END(copyin_smap_erms) ALIGN_TEXT /* Trap entry clears PSL.AC */ copy_fault: - movq $0,PCB_ONFAULT(%r9) + movq $0,PCB_ONFAULT(%r11) movl $EFAULT,%eax POP_FRAME_POINTER ret From owner-svn-src-head@freebsd.org Fri Oct 12 22:40:56 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 489C510CD7D1; Fri, 12 Oct 2018 22:40:56 +0000 (UTC) (envelope-from erj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F32A67995D; Fri, 12 Oct 2018 22:40:55 +0000 (UTC) (envelope-from erj@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EDE9D25ACB; Fri, 12 Oct 2018 22:40:55 +0000 (UTC) (envelope-from erj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9CMetUQ018077; Fri, 12 Oct 2018 22:40:55 GMT (envelope-from erj@FreeBSD.org) Received: (from erj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9CMesr3018070; Fri, 12 Oct 2018 22:40:54 GMT (envelope-from erj@FreeBSD.org) Message-Id: <201810122240.w9CMesr3018070@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: erj set sender to erj@FreeBSD.org using -f From: Eric Joyner Date: Fri, 12 Oct 2018 22:40:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339338 - in head/sys: amd64/conf conf dev/ixl modules modules/iavf modules/ixl modules/ixlv net X-SVN-Group: head X-SVN-Commit-Author: erj X-SVN-Commit-Paths: in head/sys: amd64/conf conf dev/ixl modules modules/iavf modules/ixl modules/ixlv net X-SVN-Commit-Revision: 339338 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.27 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, 12 Oct 2018 22:40:56 -0000 Author: erj Date: Fri Oct 12 22:40:54 2018 New Revision: 339338 URL: https://svnweb.freebsd.org/changeset/base/339338 Log: ixl/iavf(4): Change ixlv to iavf and update it to use iflib(9) Finishes the conversion of the 40Gb Intel Ethernet drivers to iflib(9) for FreeBSD 12.0, and fixes numerous bugs in both ixl(4) and iavf(4). This commit also re-adds the VF driver to GENERIC since it now compiles and functions. The VF driver name was changed from ixlv(4) to iavf(4) because the VF driver is now intended to be used with future products, not just with Fortville/Fort Park VFs. A man page update that documents these drivers is forthcoming in a separate commit. Reviewed by: sbruno@, kbowling@ Tested by: jeffrey.e.pieper@intel.com Approved by: re (gjb@) Relnotes: yes Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D16429 Added: head/sys/modules/iavf/ head/sys/modules/iavf/Makefile (contents, props changed) Deleted: head/sys/dev/ixl/README head/sys/dev/ixl/ixlv_vc_mgr.h head/sys/modules/ixlv/ Modified: head/sys/amd64/conf/GENERIC head/sys/amd64/conf/NOTES head/sys/conf/files.amd64 head/sys/dev/ixl/i40e_osdep.c head/sys/dev/ixl/if_ixl.c head/sys/dev/ixl/if_ixlv.c head/sys/dev/ixl/ixl.h head/sys/dev/ixl/ixl_debug.h head/sys/dev/ixl/ixl_pf.h head/sys/dev/ixl/ixl_pf_iov.c head/sys/dev/ixl/ixl_pf_iov.h head/sys/dev/ixl/ixl_pf_main.c head/sys/dev/ixl/ixl_pf_qmgr.c head/sys/dev/ixl/ixl_pf_qmgr.h head/sys/dev/ixl/ixl_txrx.c head/sys/dev/ixl/ixlv.h head/sys/dev/ixl/ixlvc.c head/sys/modules/Makefile head/sys/modules/ixl/Makefile head/sys/net/iflib.c head/sys/net/iflib.h head/sys/net/iflib_private.h Modified: head/sys/amd64/conf/GENERIC ============================================================================== --- head/sys/amd64/conf/GENERIC Fri Oct 12 21:59:09 2018 (r339337) +++ head/sys/amd64/conf/GENERIC Fri Oct 12 22:40:54 2018 (r339338) @@ -240,9 +240,8 @@ device de # DEC/Intel DC21x4x (``Tulip'') device em # Intel PRO/1000 Gigabit Ethernet Family device ix # Intel PRO/10GbE PCIE PF Ethernet device ixv # Intel PRO/10GbE PCIE VF Ethernet -device ixl # Intel XL710 40Gbe PCIE Ethernet -#options IXL_IW # Enable iWARP Client Interface in ixl(4) -#device ixlv # Intel XL710 40Gbe VF PCIE Ethernet +device ixl # Intel 700 Series Physical Function +device iavf # Intel Adaptive Virtual Function device le # AMD Am7900 LANCE and Am79C9xx PCnet device ti # Alteon Networks Tigon I/II gigabit Ethernet device txp # 3Com 3cR990 (``Typhoon'') Modified: head/sys/amd64/conf/NOTES ============================================================================== --- head/sys/amd64/conf/NOTES Fri Oct 12 21:59:09 2018 (r339337) +++ head/sys/amd64/conf/NOTES Fri Oct 12 22:40:54 2018 (r339338) @@ -313,8 +313,6 @@ options DRM_DEBUG # Include debug printfs (slow) # iwn: Intel Wireless WiFi Link 1000/105/135/2000/4965/5000/6000/6050 abgn # 802.11 network adapters # Requires the iwn firmware module -# ixl: Intel XL710 40Gbe PCIE Ethernet -# ixlv: Intel XL710 40Gbe VF PCIE Ethernet # mthca: Mellanox HCA InfiniBand # mlx4ib: Mellanox ConnectX HCA InfiniBand # mlx4en: Mellanox ConnectX HCA Ethernet @@ -332,9 +330,8 @@ options ED_SIC device ipw # Intel 2100 wireless NICs. device iwi # Intel 2200BG/2225BG/2915ABG wireless NICs. device iwn # Intel 4965/1000/5000/6000 wireless NICs. -device ixl # Intel XL710 40Gbe PCIE Ethernet -#options IXL_IW # Enable iWARP Client Interface in ixl(4) -#device ixlv # Intel XL710 40Gbe VF PCIE Ethernet +device ixl # Intel 700 Series Physical Function +device iavf # Intel Adaptive Virtual Function device mthca # Mellanox HCA InfiniBand device mlx4 # Shared code module between IB and Ethernet device mlx4ib # Mellanox ConnectX HCA InfiniBand Modified: head/sys/conf/files.amd64 ============================================================================== --- head/sys/conf/files.amd64 Fri Oct 12 21:59:09 2018 (r339337) +++ head/sys/conf/files.amd64 Fri Oct 12 22:40:54 2018 (r339338) @@ -271,25 +271,23 @@ dev/ixl/ixl_pf_iov.c optional ixl pci pci_iov \ compile-with "${NORMAL_C} -I$S/dev/ixl" dev/ixl/ixl_pf_i2c.c optional ixl pci \ compile-with "${NORMAL_C} -I$S/dev/ixl" -#dev/ixl/ixl_iw.c optional ixl pci \ -# compile-with "${NORMAL_C} -I$S/dev/ixl" -#dev/ixl/if_ixlv.c optional ixlv pci \ -# compile-with "${NORMAL_C} -I$S/dev/ixl" -#dev/ixl/ixlvc.c optional ixlv pci \ -# compile-with "${NORMAL_C} -I$S/dev/ixl" -dev/ixl/ixl_txrx.c optional ixl pci | ixlv pci \ +dev/ixl/if_ixlv.c optional iavf pci \ compile-with "${NORMAL_C} -I$S/dev/ixl" -dev/ixl/i40e_osdep.c optional ixl pci | ixlv pci \ +dev/ixl/ixlvc.c optional iavf pci \ compile-with "${NORMAL_C} -I$S/dev/ixl" -dev/ixl/i40e_lan_hmc.c optional ixl pci | ixlv pci \ +dev/ixl/ixl_txrx.c optional ixl pci | iavf pci \ compile-with "${NORMAL_C} -I$S/dev/ixl" -dev/ixl/i40e_hmc.c optional ixl pci | ixlv pci \ +dev/ixl/i40e_osdep.c optional ixl pci | iavf pci \ compile-with "${NORMAL_C} -I$S/dev/ixl" -dev/ixl/i40e_common.c optional ixl pci | ixlv pci \ +dev/ixl/i40e_lan_hmc.c optional ixl pci | iavf pci \ compile-with "${NORMAL_C} -I$S/dev/ixl" -dev/ixl/i40e_nvm.c optional ixl pci | ixlv pci \ +dev/ixl/i40e_hmc.c optional ixl pci | iavf pci \ compile-with "${NORMAL_C} -I$S/dev/ixl" -dev/ixl/i40e_adminq.c optional ixl pci | ixlv pci \ +dev/ixl/i40e_common.c optional ixl pci | iavf pci \ + compile-with "${NORMAL_C} -I$S/dev/ixl" +dev/ixl/i40e_nvm.c optional ixl pci | iavf pci \ + compile-with "${NORMAL_C} -I$S/dev/ixl" +dev/ixl/i40e_adminq.c optional ixl pci | iavf pci \ compile-with "${NORMAL_C} -I$S/dev/ixl" dev/ixl/i40e_dcb.c optional ixl pci \ compile-with "${NORMAL_C} -I$S/dev/ixl" Modified: head/sys/dev/ixl/i40e_osdep.c ============================================================================== --- head/sys/dev/ixl/i40e_osdep.c Fri Oct 12 21:59:09 2018 (r339337) +++ head/sys/dev/ixl/i40e_osdep.c Fri Oct 12 22:40:54 2018 (r339338) @@ -161,27 +161,25 @@ i40e_destroy_spinlock(struct i40e_spinlock *lock) mtx_destroy(&lock->mutex); } +static inline int +ixl_ms_scale(int x) +{ + if (hz == 1000) + return (x); + else if (hz > 1000) + return (x*(hz/1000)); + else + return (max(1, x/(1000/hz))); +} + void i40e_msec_pause(int msecs) { - int ticks_to_pause = (msecs * hz) / 1000; - int start_ticks = ticks; - - if (cold || SCHEDULER_STOPPED()) { + if (cold || SCHEDULER_STOPPED()) i40e_msec_delay(msecs); - return; - } - - while (1) { - kern_yield(PRI_USER); - int yielded_ticks = ticks - start_ticks; - if (yielded_ticks > ticks_to_pause) - break; - else if (yielded_ticks < 0 - && (yielded_ticks + INT_MAX + 1 > ticks_to_pause)) { - break; - } - } + else + // ERJ: (msecs * hz) could overflow + pause("ixl", ixl_ms_scale(msecs)); } /* @@ -272,7 +270,5 @@ i40e_write_pci_cfg(struct i40e_hw *hw, u32 reg, u16 va { pci_write_config(((struct i40e_osdep *)hw->back)->dev, reg, value, 2); - - return; } Modified: head/sys/dev/ixl/if_ixl.c ============================================================================== --- head/sys/dev/ixl/if_ixl.c Fri Oct 12 21:59:09 2018 (r339337) +++ head/sys/dev/ixl/if_ixl.c Fri Oct 12 22:40:54 2018 (r339338) @@ -48,7 +48,7 @@ * Driver version *********************************************************************/ #define IXL_DRIVER_VERSION_MAJOR 2 -#define IXL_DRIVER_VERSION_MINOR 0 +#define IXL_DRIVER_VERSION_MINOR 1 #define IXL_DRIVER_VERSION_BUILD 0 #define IXL_DRIVER_VERSION_STRING \ @@ -115,10 +115,11 @@ static void ixl_if_timer(if_ctx_t ctx, uint16_t qid); static void ixl_if_vlan_register(if_ctx_t ctx, u16 vtag); static void ixl_if_vlan_unregister(if_ctx_t ctx, u16 vtag); static uint64_t ixl_if_get_counter(if_ctx_t ctx, ift_counter cnt); -static void ixl_if_vflr_handle(if_ctx_t ctx); -// static void ixl_if_link_intr_enable(if_ctx_t ctx); static int ixl_if_i2c_req(if_ctx_t ctx, struct ifi2creq *req); static int ixl_if_priv_ioctl(if_ctx_t ctx, u_long command, caddr_t data); +#ifdef PCI_IOV +static void ixl_if_vflr_handle(if_ctx_t ctx); +#endif /*** Other ***/ static int ixl_mc_filter_apply(void *arg, struct ifmultiaddr *ifma, int); @@ -137,9 +138,9 @@ static device_method_t ixl_methods[] = { DEVMETHOD(device_detach, iflib_device_detach), DEVMETHOD(device_shutdown, iflib_device_shutdown), #ifdef PCI_IOV - DEVMETHOD(pci_iov_init, ixl_iov_init), - DEVMETHOD(pci_iov_uninit, ixl_iov_uninit), - DEVMETHOD(pci_iov_add_vf, ixl_add_vf), + DEVMETHOD(pci_iov_init, iflib_device_iov_init), + DEVMETHOD(pci_iov_uninit, iflib_device_iov_uninit), + DEVMETHOD(pci_iov_add_vf, iflib_device_iov_add_vf), #endif DEVMETHOD_END }; @@ -169,7 +170,6 @@ static device_method_t ixl_if_methods[] = { DEVMETHOD(ifdi_msix_intr_assign, ixl_if_msix_intr_assign), DEVMETHOD(ifdi_intr_enable, ixl_if_enable_intr), DEVMETHOD(ifdi_intr_disable, ixl_if_disable_intr), - //DEVMETHOD(ifdi_link_intr_enable, ixl_if_link_intr_enable), DEVMETHOD(ifdi_rx_queue_intr_enable, ixl_if_rx_queue_intr_enable), DEVMETHOD(ifdi_tx_queue_intr_enable, ixl_if_tx_queue_intr_enable), DEVMETHOD(ifdi_tx_queues_alloc, ixl_if_tx_queues_alloc), @@ -185,9 +185,14 @@ static device_method_t ixl_if_methods[] = { DEVMETHOD(ifdi_vlan_register, ixl_if_vlan_register), DEVMETHOD(ifdi_vlan_unregister, ixl_if_vlan_unregister), DEVMETHOD(ifdi_get_counter, ixl_if_get_counter), - DEVMETHOD(ifdi_vflr_handle, ixl_if_vflr_handle), DEVMETHOD(ifdi_i2c_req, ixl_if_i2c_req), DEVMETHOD(ifdi_priv_ioctl, ixl_if_priv_ioctl), +#ifdef PCI_IOV + DEVMETHOD(ifdi_iov_init, ixl_if_iov_init), + DEVMETHOD(ifdi_iov_uninit, ixl_if_iov_uninit), + DEVMETHOD(ifdi_iov_vf_add, ixl_if_iov_vf_add), + DEVMETHOD(ifdi_vflr_handle, ixl_if_vflr_handle), +#endif // ifdi_led_func // ifdi_debug DEVMETHOD_END @@ -202,7 +207,7 @@ static driver_t ixl_if_driver = { */ static SYSCTL_NODE(_hw, OID_AUTO, ixl, CTLFLAG_RD, 0, - "IXL driver parameters"); + "ixl driver parameters"); /* * Leave this on unless you need to send flow control @@ -222,6 +227,13 @@ SYSCTL_INT(_hw_ixl, OID_AUTO, i2c_access_method, CTLFL &ixl_i2c_access_method, 0, IXL_SYSCTL_HELP_I2C_METHOD); +static int ixl_enable_vf_loopback = 1; +TUNABLE_INT("hw.ixl.enable_vf_loopback", + &ixl_enable_vf_loopback); +SYSCTL_INT(_hw_ixl, OID_AUTO, enable_vf_loopback, CTLFLAG_RDTUN, + &ixl_enable_vf_loopback, 0, + IXL_SYSCTL_HELP_VF_LOOPBACK); + /* * Different method for processing TX descriptor * completion. @@ -333,9 +345,9 @@ ixl_register(device_t dev) static int ixl_allocate_pci_resources(struct ixl_pf *pf) { - int rid; - struct i40e_hw *hw = &pf->hw; device_t dev = iflib_get_dev(pf->vsi.ctx); + struct i40e_hw *hw = &pf->hw; + int rid; /* Map BAR0 */ rid = PCIR_BAR(0); @@ -386,21 +398,17 @@ ixl_if_attach_pre(if_ctx_t ctx) enum i40e_status_code status; int error = 0; - INIT_DEBUGOUT("ixl_if_attach_pre: begin"); + INIT_DBG_DEV(dev, "begin"); - /* Allocate, clear, and link in our primary soft structure */ dev = iflib_get_dev(ctx); pf = iflib_get_softc(ctx); + vsi = &pf->vsi; vsi->back = pf; pf->dev = dev; hw = &pf->hw; - /* - ** Note this assumes we have a single embedded VSI, - ** this could be enhanced later to allocate multiple - */ - //vsi->dev = pf->dev; + vsi->dev = dev; vsi->hw = &pf->hw; vsi->id = 0; vsi->num_vlans = 0; @@ -545,6 +553,7 @@ ixl_if_attach_pre(if_ctx_t ctx) * sizeof(struct i40e_tx_desc), DBA_ALIGN); scctx->isc_txrx = &ixl_txrx_dwb; } + scctx->isc_txrx->ift_legacy_intr = ixl_intr; scctx->isc_rxqsizes[0] = roundup2(scctx->isc_nrxd[0] * sizeof(union i40e_32byte_rx_desc), DBA_ALIGN); scctx->isc_msix_bar = PCIR_BAR(IXL_MSIX_BAR); @@ -556,7 +565,7 @@ ixl_if_attach_pre(if_ctx_t ctx) scctx->isc_tx_csum_flags = CSUM_OFFLOAD; scctx->isc_capabilities = scctx->isc_capenable = IXL_CAPS; - INIT_DEBUGOUT("ixl_if_attach_pre: end"); + INIT_DBG_DEV(dev, "end"); return (0); err_mac_hmc: @@ -579,7 +588,7 @@ ixl_if_attach_post(if_ctx_t ctx) int error = 0; enum i40e_status_code status; - INIT_DEBUGOUT("ixl_if_attach_post: begin"); + INIT_DBG_DEV(dev, "begin"); dev = iflib_get_dev(ctx); pf = iflib_get_softc(ctx); @@ -587,6 +596,10 @@ ixl_if_attach_post(if_ctx_t ctx) vsi->ifp = iflib_get_ifp(ctx); hw = &pf->hw; + /* Save off determined number of queues for interface */ + vsi->num_rx_queues = vsi->shared->isc_nrxqsets; + vsi->num_tx_queues = vsi->shared->isc_ntxqsets; + /* Setup OS network interface / ifnet */ if (ixl_setup_interface(dev, pf)) { device_printf(dev, "interface setup failed!\n"); @@ -694,6 +707,10 @@ err: return (error); } +/** + * XXX: iflib always ignores the return value of detach() + * -> This means that this isn't allowed to fail + */ static int ixl_if_detach(if_ctx_t ctx) { @@ -702,7 +719,7 @@ ixl_if_detach(if_ctx_t ctx) struct i40e_hw *hw = &pf->hw; device_t dev = pf->dev; enum i40e_status_code status; -#if defined(PCI_IOV) || defined(IXL_IW) +#ifdef IXL_IW int error; #endif @@ -713,17 +730,10 @@ ixl_if_detach(if_ctx_t ctx) error = ixl_iw_pf_detach(pf); if (error == EBUSY) { device_printf(dev, "iwarp in use; stop it first.\n"); - return (error); + //return (error); } } #endif -#ifdef PCI_IOV - error = pci_iov_detach(dev); - if (error != 0) { - device_printf(dev, "SR-IOV in use; detach first.\n"); - return (error); - } -#endif /* Remove all previously allocated media types */ ifmedia_removeall(vsi->media); @@ -751,7 +761,6 @@ ixl_if_detach(if_ctx_t ctx) return (0); } -/* TODO: Do shutdown-specific stuff here */ static int ixl_if_shutdown(if_ctx_t ctx) { @@ -796,43 +805,13 @@ ixl_if_resume(if_ctx_t ctx) return (0); } -/* Set Report Status queue fields to 0 */ -static void -ixl_init_tx_rsqs(struct ixl_vsi *vsi) -{ - if_softc_ctx_t scctx = vsi->shared; - struct ixl_tx_queue *tx_que; - int i, j; - - for (i = 0, tx_que = vsi->tx_queues; i < vsi->num_tx_queues; i++, tx_que++) { - struct tx_ring *txr = &tx_que->txr; - - txr->tx_rs_cidx = txr->tx_rs_pidx = txr->tx_cidx_processed = 0; - - for (j = 0; j < scctx->isc_ntxd[0]; j++) - txr->tx_rsq[j] = QIDX_INVALID; - } -} - -static void -ixl_init_tx_cidx(struct ixl_vsi *vsi) -{ - struct ixl_tx_queue *tx_que; - int i; - - for (i = 0, tx_que = vsi->tx_queues; i < vsi->num_tx_queues; i++, tx_que++) { - struct tx_ring *txr = &tx_que->txr; - - txr->tx_cidx_processed = 0; - } -} - void ixl_if_init(if_ctx_t ctx) { struct ixl_pf *pf = iflib_get_softc(ctx); struct ixl_vsi *vsi = &pf->vsi; struct i40e_hw *hw = &pf->hw; + struct ifnet *ifp = iflib_get_ifp(ctx); device_t dev = iflib_get_dev(ctx); u8 tmpaddr[ETHER_ADDR_LEN]; int ret; @@ -840,12 +819,12 @@ ixl_if_init(if_ctx_t ctx) /* * If the aq is dead here, it probably means something outside of the driver * did something to the adapter, like a PF reset. - * So rebuild the driver's state here if that occurs. + * So, rebuild the driver's state here if that occurs. */ if (!i40e_check_asq_alive(&pf->hw)) { device_printf(dev, "Admin Queue is down; resetting...\n"); ixl_teardown_hw_structs(pf); - ixl_reset(pf); + ixl_rebuild_hw_structs_after_reset(pf); } /* Get the latest mac address... User might use a LAA */ @@ -872,8 +851,7 @@ ixl_if_init(if_ctx_t ctx) return; } - // TODO: Call iflib setup multicast filters here? - // It's called in ixgbe in D5213 + /* Reconfigure multicast filters in HW */ ixl_if_multi_set(ctx); /* Set up RSS */ @@ -895,8 +873,12 @@ ixl_if_init(if_ctx_t ctx) i40e_aq_set_default_vsi(hw, vsi->seid, NULL); + /* Re-add configure filters to HW */ ixl_reconfigure_filters(vsi); + /* Configure promiscuous mode */ + ixl_if_promisc_set(ctx, if_getflags(ifp)); + #ifdef IXL_IW if (ixl_enable_iwarp && pf->iw_enabled) { ret = ixl_iw_pf_init(pf); @@ -923,7 +905,7 @@ ixl_if_stop(if_ctx_t ctx) #endif ixl_disable_rings_intr(vsi); - ixl_disable_rings(vsi); + ixl_disable_rings(pf, vsi, &pf->qtag); } static int @@ -936,6 +918,9 @@ ixl_if_msix_intr_assign(if_ctx_t ctx, int msix) int err, i, rid, vector = 0; char buf[16]; + MPASS(vsi->shared->isc_nrxqsets > 0); + MPASS(vsi->shared->isc_ntxqsets > 0); + /* Admin Que must use vector 0*/ rid = vector + 1; err = iflib_irq_alloc_generic(ctx, &vsi->irq, rid, IFLIB_INTR_ADMIN, @@ -943,14 +928,14 @@ ixl_if_msix_intr_assign(if_ctx_t ctx, int msix) if (err) { iflib_irq_free(ctx, &vsi->irq); device_printf(iflib_get_dev(ctx), - "Failed to register Admin que handler"); + "Failed to register Admin Que handler"); return (err); } - // TODO: Re-enable this at some point - // iflib_softirq_alloc_generic(ctx, rid, IFLIB_INTR_IOV, pf, 0, "ixl_iov"); + /* Create soft IRQ for handling VFLRs */ + iflib_softirq_alloc_generic(ctx, &pf->iov_irq, IFLIB_INTR_IOV, pf, 0, "iov"); /* Now set up the stations */ - for (i = 0, vector = 1; i < vsi->num_rx_queues; i++, vector++, rx_que++) { + for (i = 0, vector = 1; i < vsi->shared->isc_nrxqsets; i++, vector++, rx_que++) { rid = vector + 1; snprintf(buf, sizeof(buf), "rxq%d", i); @@ -960,7 +945,7 @@ ixl_if_msix_intr_assign(if_ctx_t ctx, int msix) * what's expected in the iflib context? */ if (err) { device_printf(iflib_get_dev(ctx), - "Failed to allocate q int %d err: %d", i, err); + "Failed to allocate queue RX int vector %d, err: %d\n", i, err); vsi->num_rx_queues = i + 1; goto fail; } @@ -969,16 +954,16 @@ ixl_if_msix_intr_assign(if_ctx_t ctx, int msix) bzero(buf, sizeof(buf)); - for (i = 0; i < vsi->num_tx_queues; i++, tx_que++) { + for (i = 0; i < vsi->shared->isc_ntxqsets; i++, tx_que++) { snprintf(buf, sizeof(buf), "txq%d", i); iflib_softirq_alloc_generic(ctx, - &vsi->rx_queues[i % vsi->num_rx_queues].que_irq, + &vsi->rx_queues[i % vsi->shared->isc_nrxqsets].que_irq, IFLIB_INTR_TX, tx_que, tx_que->txr.me, buf); /* TODO: Maybe call a strategy function for this to figure out which * interrupts to map Tx queues to. I don't know if there's an immediately * better way than this other than a user-supplied map, though. */ - tx_que->msix = (i % vsi->num_rx_queues) + 1; + tx_que->msix = (i % vsi->shared->isc_nrxqsets) + 1; } return (0); @@ -1051,11 +1036,10 @@ ixl_if_tx_queue_intr_enable(if_ctx_t ctx, uint16_t txq { struct ixl_pf *pf = iflib_get_softc(ctx); struct ixl_vsi *vsi = &pf->vsi; - struct i40e_hw *hw = vsi->hw; - struct ixl_tx_queue *tx_que = &vsi->tx_queues[txqid]; + struct i40e_hw *hw = vsi->hw; + struct ixl_tx_queue *tx_que = &vsi->tx_queues[txqid]; ixl_enable_queue(hw, tx_que->msix - 1); - return (0); } @@ -1066,12 +1050,11 @@ ixl_if_tx_queues_alloc(if_ctx_t ctx, caddr_t *vaddrs, struct ixl_vsi *vsi = &pf->vsi; if_softc_ctx_t scctx = vsi->shared; struct ixl_tx_queue *que; - // int i; int i, j, error = 0; - MPASS(vsi->num_tx_queues > 0); + MPASS(scctx->isc_ntxqsets > 0); MPASS(ntxqs == 1); - MPASS(vsi->num_tx_queues == ntxqsets); + MPASS(scctx->isc_ntxqsets == ntxqsets); /* Allocate queue structure memory */ if (!(vsi->tx_queues = @@ -1118,9 +1101,12 @@ ixl_if_rx_queues_alloc(if_ctx_t ctx, caddr_t *vaddrs, struct ixl_rx_queue *que; int i, error = 0; - MPASS(vsi->num_rx_queues > 0); +#ifdef INVARIANTS + if_softc_ctx_t scctx = vsi->shared; + MPASS(scctx->isc_nrxqsets > 0); MPASS(nrxqs == 1); - MPASS(vsi->num_rx_queues == nrxqsets); + MPASS(scctx->isc_nrxqsets == nrxqsets); +#endif /* Allocate queue structure memory */ if (!(vsi->rx_queues = @@ -1156,7 +1142,7 @@ ixl_if_queues_free(if_ctx_t ctx) struct ixl_pf *pf = iflib_get_softc(ctx); struct ixl_vsi *vsi = &pf->vsi; - if (vsi->enable_head_writeback) { + if (!vsi->enable_head_writeback) { struct ixl_tx_queue *que; int i = 0; @@ -1208,6 +1194,20 @@ ixl_update_link_status(struct ixl_pf *pf) } } +static void +ixl_handle_lan_overflow_event(struct ixl_pf *pf, struct i40e_arq_event_info *e) +{ + device_t dev = pf->dev; + u32 rxq_idx, qtx_ctl; + + rxq_idx = (e->desc.params.external.param0 & I40E_PRTDCB_RUPTQ_RXQNUM_MASK) >> + I40E_PRTDCB_RUPTQ_RXQNUM_SHIFT; + qtx_ctl = e->desc.params.external.param1; + + device_printf(dev, "LAN overflow event: global rxq_idx %d\n", rxq_idx); + device_printf(dev, "LAN overflow event: QTX_CTL 0x%08x\n", qtx_ctl); +} + static int ixl_process_adminq(struct ixl_pf *pf, u16 *pending) { @@ -1248,7 +1248,7 @@ ixl_process_adminq(struct ixl_pf *pf, u16 *pending) * aren't currently configured. */ case i40e_aqc_opc_event_lan_overflow: - device_printf(dev, "LAN overflow event\n"); + ixl_handle_lan_overflow_event(pf, &event); break; default: break; @@ -1278,13 +1278,9 @@ ixl_if_update_admin_status(if_ctx_t ctx) if (pf->state & IXL_PF_STATE_MDD_PENDING) ixl_handle_mdd_event(pf); -#ifdef PCI_IOV - if (pf->state & IXL_PF_STATE_VF_RESET_REQ) - iflib_iov_intr_deferred(ctx); -#endif - ixl_process_adminq(pf, &pending); ixl_update_link_status(pf); + ixl_update_stats_counters(pf); /* * If there are still messages to process, reschedule ourselves. @@ -1301,14 +1297,16 @@ ixl_if_multi_set(if_ctx_t ctx) { struct ixl_pf *pf = iflib_get_softc(ctx); struct ixl_vsi *vsi = &pf->vsi; - struct i40e_hw *hw = vsi->hw; - int mcnt = 0, flags; + struct i40e_hw *hw = vsi->hw; + int mcnt = 0, flags; + int del_mcnt; IOCTL_DEBUGOUT("ixl_if_multi_set: begin"); mcnt = if_multiaddr_count(iflib_get_ifp(ctx), MAX_MULTICAST_ADDR); - /* delete existing MC filters */ - ixl_del_multi(vsi); + /* Delete filters for removed multicast addresses */ + del_mcnt = ixl_del_multi(vsi); + vsi->num_macs -= del_mcnt; if (__predict_false(mcnt == MAX_MULTICAST_ADDR)) { i40e_aq_set_vsi_multicast_promiscuous(hw, @@ -1316,13 +1314,17 @@ ixl_if_multi_set(if_ctx_t ctx) return; } /* (re-)install filters for all mcast addresses */ + /* XXX: This bypasses filter count tracking code! */ mcnt = if_multi_apply(iflib_get_ifp(ctx), ixl_mc_filter_apply, vsi); if (mcnt > 0) { + vsi->num_macs += mcnt; flags = (IXL_FILTER_ADD | IXL_FILTER_USED | IXL_FILTER_MC); ixl_add_hw_filters(vsi, flags, mcnt); } + ixl_dbg_filter(pf, "%s: filter mac total: %d\n", + __func__, vsi->num_macs); IOCTL_DEBUGOUT("ixl_if_multi_set: end"); } @@ -1518,32 +1520,11 @@ ixl_if_promisc_set(if_ctx_t ctx, int flags) static void ixl_if_timer(if_ctx_t ctx, uint16_t qid) { - struct ixl_pf *pf = iflib_get_softc(ctx); - //struct i40e_hw *hw = &pf->hw; - //struct ixl_tx_queue *que = &vsi->tx_queues[qid]; - #if 0 - u32 mask; - - /* - ** Check status of the queues - */ - mask = (I40E_PFINT_DYN_CTLN_INTENA_MASK | - I40E_PFINT_DYN_CTLN_SWINT_TRIG_MASK); - - /* If queue param has outstanding work, trigger sw irq */ - // TODO: TX queues in iflib don't use HW interrupts; does this do anything? - if (que->busy) - wr32(hw, I40E_PFINT_DYN_CTLN(que->txr.me), mask); -#endif - if (qid != 0) return; /* Fire off the adminq task */ iflib_admin_intr_deferred(ctx); - - /* Update stats */ - ixl_update_stats_counters(pf); } static void @@ -1612,13 +1593,15 @@ ixl_if_get_counter(if_ctx_t ctx, ift_counter cnt) } } +#ifdef PCI_IOV static void ixl_if_vflr_handle(if_ctx_t ctx) { - IXL_DEV_ERR(iflib_get_dev(ctx), ""); + struct ixl_pf *pf = iflib_get_softc(ctx); - // TODO: call ixl_handle_vflr() + ixl_handle_vflr(pf); } +#endif static int ixl_if_i2c_req(if_ctx_t ctx, struct ifi2creq *req) @@ -1676,6 +1659,7 @@ ixl_save_pf_tunables(struct ixl_pf *pf) pf->dbg_mask = ixl_core_debug_mask; pf->hw.debug_mask = ixl_shared_debug_mask; pf->vsi.enable_head_writeback = !!(ixl_enable_head_writeback); + pf->enable_vf_loopback = !!(ixl_enable_vf_loopback); #if 0 pf->dynamic_rx_itr = ixl_dynamic_rx_itr; pf->dynamic_tx_itr = ixl_dynamic_tx_itr; Modified: head/sys/dev/ixl/if_ixlv.c ============================================================================== --- head/sys/dev/ixl/if_ixlv.c Fri Oct 12 21:59:09 2018 (r339337) +++ head/sys/dev/ixl/if_ixlv.c Fri Oct 12 22:40:54 2018 (r339338) @@ -32,19 +32,19 @@ ******************************************************************************/ /*$FreeBSD$*/ -#include "ixl.h" #include "ixlv.h" /********************************************************************* * Driver version *********************************************************************/ -#define IXLV_DRIVER_VERSION_MAJOR 1 -#define IXLV_DRIVER_VERSION_MINOR 5 -#define IXLV_DRIVER_VERSION_BUILD 4 +#define IAVF_DRIVER_VERSION_MAJOR 2 +#define IAVF_DRIVER_VERSION_MINOR 0 +#define IAVF_DRIVER_VERSION_BUILD 0 -char ixlv_driver_version[] = __XSTRING(IXLV_DRIVER_VERSION_MAJOR) "." - __XSTRING(IXLV_DRIVER_VERSION_MINOR) "." - __XSTRING(IXLV_DRIVER_VERSION_BUILD) "-iflib-k"; +#define IAVF_DRIVER_VERSION_STRING \ + __XSTRING(IAVF_DRIVER_VERSION_MAJOR) "." \ + __XSTRING(IAVF_DRIVER_VERSION_MINOR) "." \ + __XSTRING(IAVF_DRIVER_VERSION_BUILD) "-k" /********************************************************************* * PCI Device ID Table @@ -56,9 +56,9 @@ char ixlv_driver_version[] = __XSTRING(IXLV_DRIVER_VER static pci_vendor_info_t ixlv_vendor_info_array[] = { - {I40E_INTEL_VENDOR_ID, I40E_DEV_ID_VF, 0, 0, 0}, - {I40E_INTEL_VENDOR_ID, I40E_DEV_ID_X722_VF, 0, 0, 0}, - {I40E_INTEL_VENDOR_ID, I40E_DEV_ID_ADAPTIVE_VF, 0, 0, 0}, + PVID(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_VF, "Intel(R) Ethernet Virtual Function 700 Series"), + PVID(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_X722_VF, "Intel(R) Ethernet Virtual Function 700 Series (X722)"), + PVID(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_ADAPTIVE_VF, "Intel(R) Ethernet Adaptive Virtual Function"), /* required last entry */ PVID_END }; @@ -66,7 +66,7 @@ static pci_vendor_info_t ixlv_vendor_info_array[] = /********************************************************************* * Function prototypes *********************************************************************/ -static void *ixlv_register(device_t dev); +static void *ixlv_register(device_t dev); static int ixlv_if_attach_pre(if_ctx_t ctx); static int ixlv_if_attach_post(if_ctx_t ctx); static int ixlv_if_detach(if_ctx_t ctx); @@ -76,7 +76,8 @@ static int ixlv_if_resume(if_ctx_t ctx); static int ixlv_if_msix_intr_assign(if_ctx_t ctx, int msix); static void ixlv_if_enable_intr(if_ctx_t ctx); static void ixlv_if_disable_intr(if_ctx_t ctx); -static int ixlv_if_queue_intr_enable(if_ctx_t ctx, uint16_t rxqid); +static int ixlv_if_rx_queue_intr_enable(if_ctx_t ctx, uint16_t rxqid); +static int ixlv_if_tx_queue_intr_enable(if_ctx_t ctx, uint16_t txqid); static int ixlv_if_tx_queues_alloc(if_ctx_t ctx, caddr_t *vaddrs, uint64_t *paddrs, int ntxqs, int ntxqsets); static int ixlv_if_rx_queues_alloc(if_ctx_t ctx, caddr_t *vaddrs, uint64_t *paddrs, int nqs, int nqsets); static void ixlv_if_queues_free(if_ctx_t ctx); @@ -100,8 +101,8 @@ static int ixlv_vf_config(struct ixlv_sc *); static void ixlv_init_filters(struct ixlv_sc *); static void ixlv_free_pci_resources(struct ixlv_sc *); static void ixlv_free_filters(struct ixlv_sc *); -static void ixlv_setup_interface(device_t, struct ixl_vsi *); -static void ixlv_add_sysctls(struct ixlv_sc *); +static void ixlv_setup_interface(device_t, struct ixlv_sc *); +static void ixlv_add_device_sysctls(struct ixlv_sc *); static void ixlv_enable_adminq_irq(struct i40e_hw *); static void ixlv_disable_adminq_irq(struct i40e_hw *); static void ixlv_enable_queue_irq(struct i40e_hw *, int); @@ -113,22 +114,25 @@ static int ixlv_add_mac_filter(struct ixlv_sc *, u8 *, static int ixlv_del_mac_filter(struct ixlv_sc *sc, u8 *macaddr); static int ixlv_msix_que(void *); static int ixlv_msix_adminq(void *); -static void ixlv_do_adminq_locked(struct ixlv_sc *sc); -static void ixl_init_cmd_complete(struct ixl_vc_cmd *, void *, - enum i40e_status_code); -static void ixlv_configure_itr(struct ixlv_sc *); +//static void ixlv_del_multi(struct ixlv_sc *sc); +static void ixlv_init_multi(struct ixlv_sc *sc); +static void ixlv_configure_itr(struct ixlv_sc *sc); -static void ixlv_setup_vlan_filters(struct ixlv_sc *); +static int ixlv_sysctl_rx_itr(SYSCTL_HANDLER_ARGS); +static int ixlv_sysctl_tx_itr(SYSCTL_HANDLER_ARGS); +static int ixlv_sysctl_current_speed(SYSCTL_HANDLER_ARGS); +static int ixlv_sysctl_sw_filter_list(SYSCTL_HANDLER_ARGS); +static int ixlv_sysctl_queue_interrupt_table(SYSCTL_HANDLER_ARGS); +static int ixlv_sysctl_vf_reset(SYSCTL_HANDLER_ARGS); +static int ixlv_sysctl_vflr_reset(SYSCTL_HANDLER_ARGS); -static char *ixlv_vc_speed_to_string(enum virtchnl_link_speed link_speed); -static int ixlv_sysctl_current_speed(SYSCTL_HANDLER_ARGS); +char *ixlv_vc_speed_to_string(enum virtchnl_link_speed link_speed); +static void ixlv_save_tunables(struct ixlv_sc *); +static enum i40e_status_code + ixlv_process_adminq(struct ixlv_sc *, u16 *); +static int ixlv_send_vc_msg(struct ixlv_sc *sc, u32 op); +static int ixlv_send_vc_msg_sleep(struct ixlv_sc *sc, u32 op); -// static void ixlv_add_sysctls(struct ixlv_sc *); -#ifdef IXL_DEBUG -static int ixlv_sysctl_qtx_tail_handler(SYSCTL_HANDLER_ARGS); -static int ixlv_sysctl_qrx_tail_handler(SYSCTL_HANDLER_ARGS); -#endif - /********************************************************************* * FreeBSD Device Interface Entry Points *********************************************************************/ @@ -144,18 +148,22 @@ static device_method_t ixlv_methods[] = { }; static driver_t ixlv_driver = { - "ixlv", ixlv_methods, sizeof(struct ixlv_sc), + "iavf", ixlv_methods, sizeof(struct ixlv_sc), }; devclass_t ixlv_devclass; -DRIVER_MODULE(ixlv, pci, ixlv_driver, ixlv_devclass, 0, 0); +DRIVER_MODULE(iavf, pci, ixlv_driver, ixlv_devclass, 0, 0); MODULE_PNP_INFO("U32:vendor;U32:device;U32:subvendor;U32:subdevice;U32:revision", - pci, ixlv, ixlv_vendor_info_array, + pci, iavf, ixlv_vendor_info_array, nitems(ixlv_vendor_info_array) - 1); -MODULE_DEPEND(ixlv, pci, 1, 1, 1); -MODULE_DEPEND(ixlv, ether, 1, 1, 1); -MODULE_DEPEND(ixlv, iflib, 1, 1, 1); +MODULE_VERSION(iavf, 1); +MODULE_DEPEND(iavf, pci, 1, 1, 1); +MODULE_DEPEND(iavf, ether, 1, 1, 1); +MODULE_DEPEND(iavf, iflib, 1, 1, 1); + +MALLOC_DEFINE(M_IXLV, "iavf", "iavf driver allocations"); + static device_method_t ixlv_if_methods[] = { DEVMETHOD(ifdi_attach_pre, ixlv_if_attach_pre), DEVMETHOD(ifdi_attach_post, ixlv_if_attach_post), @@ -168,14 +176,14 @@ static device_method_t ixlv_if_methods[] = { DEVMETHOD(ifdi_msix_intr_assign, ixlv_if_msix_intr_assign), DEVMETHOD(ifdi_intr_enable, ixlv_if_enable_intr), DEVMETHOD(ifdi_intr_disable, ixlv_if_disable_intr), - DEVMETHOD(ifdi_queue_intr_enable, ixlv_if_queue_intr_enable), + DEVMETHOD(ifdi_rx_queue_intr_enable, ixlv_if_rx_queue_intr_enable), + DEVMETHOD(ifdi_tx_queue_intr_enable, ixlv_if_tx_queue_intr_enable), DEVMETHOD(ifdi_tx_queues_alloc, ixlv_if_tx_queues_alloc), DEVMETHOD(ifdi_rx_queues_alloc, ixlv_if_rx_queues_alloc), DEVMETHOD(ifdi_queues_free, ixlv_if_queues_free), DEVMETHOD(ifdi_update_admin_status, ixlv_if_update_admin_status), DEVMETHOD(ifdi_multi_set, ixlv_if_multi_set), DEVMETHOD(ifdi_mtu_set, ixlv_if_mtu_set), - // DEVMETHOD(ifdi_crcstrip_set, ixlv_if_crcstrip_set), DEVMETHOD(ifdi_media_status, ixlv_if_media_status), DEVMETHOD(ifdi_media_change, ixlv_if_media_change), DEVMETHOD(ifdi_promisc_set, ixlv_if_promisc_set), @@ -187,95 +195,73 @@ static device_method_t ixlv_if_methods[] = { }; static driver_t ixlv_if_driver = { - "ixlv_if", ixlv_if_methods, sizeof(struct ixlv_sc) + "iavf_if", ixlv_if_methods, sizeof(struct ixlv_sc) }; /* ** TUNEABLE PARAMETERS: */ -static SYSCTL_NODE(_hw, OID_AUTO, ixlv, CTLFLAG_RD, 0, - "IXLV driver parameters"); +static SYSCTL_NODE(_hw, OID_AUTO, iavf, CTLFLAG_RD, 0, + "iavf driver parameters"); /* -** Number of descriptors per ring: -** - TX and RX sizes are independently configurable -*/ -static int ixlv_tx_ring_size = IXL_DEFAULT_RING; -TUNABLE_INT("hw.ixlv.tx_ring_size", &ixlv_tx_ring_size); -SYSCTL_INT(_hw_ixlv, OID_AUTO, tx_ring_size, CTLFLAG_RDTUN, - &ixlv_tx_ring_size, 0, "TX Descriptor Ring Size"); - -static int ixlv_rx_ring_size = IXL_DEFAULT_RING; -TUNABLE_INT("hw.ixlv.rx_ring_size", &ixlv_rx_ring_size); -SYSCTL_INT(_hw_ixlv, OID_AUTO, rx_ring_size, CTLFLAG_RDTUN, - &ixlv_rx_ring_size, 0, "TX Descriptor Ring Size"); - -/* Set to zero to auto calculate */ -int ixlv_max_queues = 0; -TUNABLE_INT("hw.ixlv.max_queues", &ixlv_max_queues); -SYSCTL_INT(_hw_ixlv, OID_AUTO, max_queues, CTLFLAG_RDTUN, - &ixlv_max_queues, 0, "Number of Queues"); - -/* * Different method for processing TX descriptor * completion. */ static int ixlv_enable_head_writeback = 0; -TUNABLE_INT("hw.ixlv.enable_head_writeback", +TUNABLE_INT("hw.iavf.enable_head_writeback", &ixlv_enable_head_writeback); -SYSCTL_INT(_hw_ixlv, OID_AUTO, enable_head_writeback, CTLFLAG_RDTUN, +SYSCTL_INT(_hw_iavf, OID_AUTO, enable_head_writeback, CTLFLAG_RDTUN, &ixlv_enable_head_writeback, 0, "For detecting last completed TX descriptor by hardware, use value written by HW instead of checking descriptors"); -/* -** Controls for Interrupt Throttling -** - true/false for dynamic adjustment -** - default values for static ITR -*/ -int ixlv_dynamic_rx_itr = 0; -TUNABLE_INT("hw.ixlv.dynamic_rx_itr", &ixlv_dynamic_rx_itr); -SYSCTL_INT(_hw_ixlv, OID_AUTO, dynamic_rx_itr, CTLFLAG_RDTUN, - &ixlv_dynamic_rx_itr, 0, "Dynamic RX Interrupt Rate"); +static int ixlv_core_debug_mask = 0; +TUNABLE_INT("hw.iavf.core_debug_mask", + &ixlv_core_debug_mask); +SYSCTL_INT(_hw_iavf, OID_AUTO, core_debug_mask, CTLFLAG_RDTUN, + &ixlv_core_debug_mask, 0, + "Display debug statements that are printed in non-shared code"); -int ixlv_dynamic_tx_itr = 0; -TUNABLE_INT("hw.ixlv.dynamic_tx_itr", &ixlv_dynamic_tx_itr); -SYSCTL_INT(_hw_ixlv, OID_AUTO, dynamic_tx_itr, CTLFLAG_RDTUN, - &ixlv_dynamic_tx_itr, 0, "Dynamic TX Interrupt Rate"); +static int ixlv_shared_debug_mask = 0; +TUNABLE_INT("hw.iavf.shared_debug_mask", + &ixlv_shared_debug_mask); +SYSCTL_INT(_hw_iavf, OID_AUTO, shared_debug_mask, CTLFLAG_RDTUN, + &ixlv_shared_debug_mask, 0, + "Display debug statements that are printed in shared code"); int ixlv_rx_itr = IXL_ITR_8K; -TUNABLE_INT("hw.ixlv.rx_itr", &ixlv_rx_itr); -SYSCTL_INT(_hw_ixlv, OID_AUTO, rx_itr, CTLFLAG_RDTUN, +TUNABLE_INT("hw.iavf.rx_itr", &ixlv_rx_itr); +SYSCTL_INT(_hw_iavf, OID_AUTO, rx_itr, CTLFLAG_RDTUN, &ixlv_rx_itr, 0, "RX Interrupt Rate"); int ixlv_tx_itr = IXL_ITR_4K; -TUNABLE_INT("hw.ixlv.tx_itr", &ixlv_tx_itr); -SYSCTL_INT(_hw_ixlv, OID_AUTO, tx_itr, CTLFLAG_RDTUN, +TUNABLE_INT("hw.iavf.tx_itr", &ixlv_tx_itr); +SYSCTL_INT(_hw_iavf, OID_AUTO, tx_itr, CTLFLAG_RDTUN, &ixlv_tx_itr, 0, "TX Interrupt Rate"); -extern struct if_txrx ixl_txrx; +extern struct if_txrx ixl_txrx_hwb; +extern struct if_txrx ixl_txrx_dwb; static struct if_shared_ctx ixlv_sctx_init = { .isc_magic = IFLIB_MAGIC, .isc_q_align = PAGE_SIZE,/* max(DBA_ALIGN, PAGE_SIZE) */ .isc_tx_maxsize = IXL_TSO_SIZE + sizeof(struct ether_vlan_header), - .isc_tx_maxsegsize = PAGE_SIZE, + .isc_tx_maxsegsize = IXL_MAX_DMA_SEG_SIZE, .isc_tso_maxsize = IXL_TSO_SIZE + sizeof(struct ether_vlan_header), - .isc_tso_maxsegsize = PAGE_SIZE, - // TODO: Review the rx_maxsize and rx_maxsegsize params - // Where are they used in iflib? + .isc_tso_maxsegsize = IXL_MAX_DMA_SEG_SIZE, .isc_rx_maxsize = 16384, - .isc_rx_nsegments = 1, - .isc_rx_maxsegsize = 16384, - // TODO: What is isc_nfl for? + .isc_rx_nsegments = IXL_MAX_RX_SEGS, + .isc_rx_maxsegsize = IXL_MAX_DMA_SEG_SIZE, .isc_nfl = 1, .isc_ntxqs = 1, .isc_nrxqs = 1, .isc_admin_intrcnt = 1, .isc_vendor_info = ixlv_vendor_info_array, - .isc_driver_version = ixlv_driver_version, + .isc_driver_version = IAVF_DRIVER_VERSION_STRING, .isc_driver = &ixlv_if_driver, + .isc_flags = IFLIB_NEED_SCRATCH | IFLIB_NEED_ZERO_CSUM | IFLIB_IS_VF, .isc_nrxd_min = {IXL_MIN_RING}, .isc_ntxd_min = {IXL_MIN_RING}, @@ -288,65 +274,83 @@ static struct if_shared_ctx ixlv_sctx_init = { if_shared_ctx_t ixlv_sctx = &ixlv_sctx_init; /*** Functions ***/ - static void * ixlv_register(device_t dev) { return (ixlv_sctx); - } +} static int +ixlv_allocate_pci_resources(struct ixlv_sc *sc) +{ + struct i40e_hw *hw = &sc->hw; + device_t dev = iflib_get_dev(sc->vsi.ctx); + int rid; + + /* Map BAR0 */ + rid = PCIR_BAR(0); + sc->pci_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, + &rid, RF_ACTIVE); + + if (!(sc->pci_mem)) { + device_printf(dev, "Unable to allocate bus resource: PCI memory\n"); + return (ENXIO); + } + + /* Save off the PCI information */ + hw->vendor_id = pci_get_vendor(dev); + hw->device_id = pci_get_device(dev); + hw->revision_id = pci_read_config(dev, PCIR_REVID, 1); + hw->subsystem_vendor_id = + pci_read_config(dev, PCIR_SUBVEND_0, 2); + hw->subsystem_device_id = + pci_read_config(dev, PCIR_SUBDEV_0, 2); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@freebsd.org Fri Oct 12 22:51:45 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DDFC310CDC9C; Fri, 12 Oct 2018 22:51:45 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9316B7A07E; Fri, 12 Oct 2018 22:51:45 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8E0BB25DB6; Fri, 12 Oct 2018 22:51:45 +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 w9CMpjXI027913; Fri, 12 Oct 2018 22:51:45 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9CMpjXU027912; Fri, 12 Oct 2018 22:51:45 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201810122251.w9CMpjXU027912@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Fri, 12 Oct 2018 22:51:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339339 - head/sys/netinet X-SVN-Group: head X-SVN-Commit-Author: bz X-SVN-Commit-Paths: head/sys/netinet X-SVN-Commit-Revision: 339339 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.27 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, 12 Oct 2018 22:51:46 -0000 Author: bz Date: Fri Oct 12 22:51:45 2018 New Revision: 339339 URL: https://svnweb.freebsd.org/changeset/base/339339 Log: In udp_input() when walking the pcblist we can come across an inp marked FREED after the epoch(9) changes. Check once we hold the lock and skip the inp if it is the case. Contrary to IPv6 the locking of the inp is outside the multicast section and hence a single check seems to suffice. PR: 232192 Reviewed by: mmacy, markj Approved by: re (kib) Differential Revision: https://reviews.freebsd.org/D17540 Modified: head/sys/netinet/udp_usrreq.c Modified: head/sys/netinet/udp_usrreq.c ============================================================================== --- head/sys/netinet/udp_usrreq.c Fri Oct 12 22:40:54 2018 (r339338) +++ head/sys/netinet/udp_usrreq.c Fri Oct 12 22:51:45 2018 (r339339) @@ -551,6 +551,11 @@ udp_input(struct mbuf **mp, int *offp, int proto) INP_RLOCK(inp); + if (__predict_false(inp->inp_flags2 & INP_FREED)) { + INP_RUNLOCK(inp); + continue; + } + /* * XXXRW: Because we weren't holding either the inpcb * or the hash lock when we checked for a match From owner-svn-src-head@freebsd.org Fri Oct 12 22:57:54 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D419C10CDF5E; Fri, 12 Oct 2018 22:57:53 +0000 (UTC) (envelope-from erj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 894047A59F; Fri, 12 Oct 2018 22:57:53 +0000 (UTC) (envelope-from erj@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8413C25E31; Fri, 12 Oct 2018 22:57:53 +0000 (UTC) (envelope-from erj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9CMvr7X028219; Fri, 12 Oct 2018 22:57:53 GMT (envelope-from erj@FreeBSD.org) Received: (from erj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9CMvrXq028216; Fri, 12 Oct 2018 22:57:53 GMT (envelope-from erj@FreeBSD.org) Message-Id: <201810122257.w9CMvrXq028216@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: erj set sender to erj@FreeBSD.org using -f From: Eric Joyner Date: Fri, 12 Oct 2018 22:57:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339340 - head/share/man/man4 X-SVN-Group: head X-SVN-Commit-Author: erj X-SVN-Commit-Paths: head/share/man/man4 X-SVN-Commit-Revision: 339340 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.27 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, 12 Oct 2018 22:57:54 -0000 Author: erj Date: Fri Oct 12 22:57:52 2018 New Revision: 339340 URL: https://svnweb.freebsd.org/changeset/base/339340 Log: ixl/iavf: Update ixl(4) and iavf(4) [previously ixlv] man pages Since there have been major updates to both drivers in r339338, refresh the man pages with new and updated information. Reviewed by: sbruno@, 0mp@, jeffrey.e.pieper@intel.com, manpages Approved by: re (gjb@, kib@) Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D15927 Added: head/share/man/man4/iavf.4 (contents, props changed) Deleted: head/share/man/man4/ixlv.4 Modified: head/share/man/man4/Makefile head/share/man/man4/ixl.4 Modified: head/share/man/man4/Makefile ============================================================================== --- head/share/man/man4/Makefile Fri Oct 12 22:51:45 2018 (r339339) +++ head/share/man/man4/Makefile Fri Oct 12 22:57:52 2018 (r339340) @@ -196,6 +196,7 @@ MAN= aac.4 \ ${_hv_vmbus.4} \ ${_hv_vss.4} \ hwpmc.4 \ + iavf.4 \ ichsmb.4 \ ${_ichwd.4} \ icmp.4 \ @@ -240,7 +241,6 @@ MAN= aac.4 \ iwnfw.4 \ ixgbe.4 \ ixl.4 \ - ixlv.4 \ jedec_dimm.4 \ jme.4 \ joy.4 \ @@ -669,7 +669,7 @@ MLINKS+=ixgbe.4 ix.4 MLINKS+=ixgbe.4 if_ix.4 MLINKS+=ixgbe.4 if_ixgbe.4 MLINKS+=ixl.4 if_ixl.4 -MLINKS+=ixlv.4 if_ixlv.4 +MLINKS+=iavf.4 if_iavf.4 MLINKS+=jme.4 if_jme.4 MLINKS+=kue.4 if_kue.4 MLINKS+=lagg.4 trunk.4 Added: head/share/man/man4/iavf.4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/man/man4/iavf.4 Fri Oct 12 22:57:52 2018 (r339340) @@ -0,0 +1,138 @@ +.\" Copyright (c) 2013-2018, Intel Corporation +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions are met: +.\" +.\" 1. Redistributions of source code must retain the above copyright notice, +.\" this list of conditions and the following disclaimer. +.\" +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" 3. Neither the name of the Intel Corporation nor the names of its +.\" contributors may be used to endorse or promote products derived from +.\" this software without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +.\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\" POSSIBILITY OF SUCH DAMAGE. +.\" +.\" * Other names and brands may be claimed as the property of others. +.\" +.\" $FreeBSD$ +.\" +.Dd October 5, 2018 +.Dt IAVF 4 +.Os +.Sh NAME +.Nm iavf +.Nd "Intel Adaptive Virtual Function driver" +.Sh SYNOPSIS +To compile this driver into the kernel, place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device iavf" +.Ed +.Pp +To load the driver as a module at boot time, place the following lines in +.Xr loader.conf 5 : +.Bd -literal -offset indent +if_iavf_load="YES" +.Ed +.Sh DESCRIPTION +The +.Nm +driver provides support for the PCI Virtual Functions from the 700 Series of +ethernet devices and newer product families. +The driver supports Jumbo Frames, TX/RX checksum offload, +TCP segmentation offload (TSO), Large Receive Offload (LRO), VLAN +tag insertion/extraction, VLAN checksum offload, VLAN TSO, and +Receive Side Steering (RSS), all for both IPv4 and IPv6. +For further hardware information and questions related to hardware +requirements, see +.Pa http://support.intel.com/ . +.Pp +Support for Jumbo Frames is provided via the interface MTU setting. +Selecting an MTU larger than 1500 bytes with the +.Xr ifconfig 8 +utility configures the adapter to receive and transmit Jumbo Frames. +The maximum MTU size for Jumbo Frames is 9706. +.Pp +Offloads are also controlled via the interface, for instance, +checksumming for both IPv4 and IPv6 can be set and unset, TSO4 +and/or TSO6, and finally LRO can be set and unset. +.Pp +For more information on configuring this device, see +.Xr ifconfig 8 . +.Pp +.Em NOTE : +This +.Nm +driver is only for Virtual Functions. +For 700 series Physical Functions, use the +.Xr ixl 4 +driver. +.Sh LOADER TUNABLES +Tunables can be set at the +.Xr loader 8 +prompt before booting the kernel or stored in +.Xr loader.conf 5 . +.Bl -tag -width indent +.It Va hw.iavf.rx_itr +The RX interrupt rate value, set to 62 (124 usec) by default. +.It Va hw.iavf.tx_itr +The TX interrupt rate value, set to 122 (244 usec) by default. +.It Va hw.iavf.enable_head_writeback +When the driver is finding the last TX descriptor processed by the hardware, +use a value written to memory by the hardware instead of scanning the +descriptor ring for completed descriptors. +Disabled by default; this mimics the "legacy" TX behavior found in +.Xr ixgbe 4 . +to ensure compatibility with future, non-700 series VF devices. +.El +.Sh SUPPORT +For general information and support, +go to the Intel support website at: +.Pa http://support.intel.com/ . +.Pp +If an issue is identified with this driver with a supported adapter, +email all the specific information related to the issue to +.Mt freebsd@intel.com . +.Sh SEE ALSO +.Xr arp 4 , +.Xr ixl 4 , +.Xr netintro 4 , +.Xr vlan 4 , +.Xr ifconfig 8 , +.Xr iflib 9 +.Sh HISTORY +The +.Nm +device driver first appeared in +.Fx 10.1 . +under the name "ixlv" +It was converted to use +.Xr iflib 9 +and changed to its current name in +.Fx 12 . +.Sh AUTHORS +.An -nosplit +The +.Nm +driver was written by +.An Jack Vogel Aq Mt jfv@freebsd.org +and +.An Eric Joyner Aq Mt erj@freebsd.org . +.Sh CAVEATS +This driver is supposed to function on VFs spawned from future network devices by Intel, +but at the time of this writing, has only been tested on the 700 series VFs. Modified: head/share/man/man4/ixl.4 ============================================================================== --- head/share/man/man4/ixl.4 Fri Oct 12 22:51:45 2018 (r339339) +++ head/share/man/man4/ixl.4 Fri Oct 12 22:57:52 2018 (r339340) @@ -1,4 +1,4 @@ -.\" Copyright (c) 2013-2015, Intel Corporation +.\" Copyright (c) 2013-2018, Intel Corporation .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -31,31 +31,44 @@ .\" .\" $FreeBSD$ .\" -.Dd March 25, 2015 +.Dd October 5, 2018 .Dt IXL 4 .Os .Sh NAME .Nm ixl -.Nd "Intel XL710 Ethernet 40Gb Base driver" +.Nd "Intel Ethernet 700 Series Driver" .Sh SYNOPSIS -To compile this driver into the kernel, -place the following lines in your +To compile this driver into the kernel, place the following lines in your kernel configuration file: .Bd -ragged -offset indent .Cd "device ixl" .Ed .Pp -To load the driver as a -module at boot time, place the following lines in +To load the driver as a module at boot time, place the following lines in .Xr loader.conf 5 : .Bd -literal -offset indent if_ixl_load="YES" .Ed .Sh DESCRIPTION +.Ss Features The .Nm -driver provides support for PCI Express adapters or LOMs -in the XL710 Family of ethernet devices. +driver provides support for any PCI Express adapter or LOM +(LAN On Motherboard) +in the Intel Ethernet 700 Series. +As of this writing, the series includes devices with these model numbers: +.Pp +.Bl -bullet -compact +.It +XL710 (40G) +.It +X710 (10G) +.It +XXV710 (25G) +.It +X722 (10G) +.El +.Pp The driver supports Jumbo Frames, TX/RX checksum offload, TCP segmentation offload (TSO), Large Receive Offload (LRO), VLAN tag insertion/extraction, VLAN checksum offload, VLAN TSO, and @@ -76,91 +89,176 @@ and/or TSO6, and finally LRO can be set and unset. .Pp For more information on configuring this device, see .Xr ifconfig 8 . +.Ss Additional Utilities +There are additional tools available from Intel to help configure and update +the adapters covered by this driver. +These tools can be downloaded directly from Intel at +.Pa downloadcenter.intel.com , +by searching for their names, or by installing certain packages: +.Bl -item +.It +To change the behavior of the QSFP+ ports on XL710 adapters, use the +Intel QCU (QSFP+ configuration utility); installed by the +.Em sysutils/intel-qcu +package. +.It +To update the firmware on an adapter, use the Intel Non-Volatile Memory (NVM) +Update Utility; installed by the +.Em sysutils/intel-nvmupdate +package. +.It +Drivers are provided by Intel outside of the +.Fx +kernel; install the +.Em net/intel-ixl-kmod +package for the latest driver. +.El .Sh HARDWARE +Most adapters in the Intel Ethernet 700 Series with SFP+/SFP28/QSFP+ cages +have firmware that requires that Intel qualified modules are used; these +qualified modules are listed below. +This qualification check cannot be disabled by the driver. +.Pp The .Nm -driver supports these SFP+ Pluggable Optics: +driver supports 40Gb Ethernet adapters with these QSFP+ modules: .Pp .Bl -bullet -compact .It -Intel TRIPLE RATE 1G/10G/40G QSFP+ SR (bailed) E40GQSFPSR +Intel 4x10G/40G QSFP+ 40GBASE-SR4 E40GQSFPSR .It -Intel TRIPLE RATE 1G/10G/40G QSFP+ SR (bailed) E40GQSFPLR +Intel 4x10G/40G QSFP+ 40GBASE-LR4 E40GQSFPLR .El .Pp The .Nm -driver supports 10Gb and 1Gb Ethernet adapters with SR Modules: +driver supports 25Gb Ethernet adapters with these SFP28 modules: .Pp .Bl -bullet -compact .It -Intel DUAL RATE 1G/10G SFP+ SR (bailed) FTLX8571D3BCV-IT +Intel 10G/25G SFP28 25GBASE-SR E25GSFP28SR .It -Intel DUAL RATE 1G/10G SFP+ SR (bailed) AFBR-703SDZ-IN2 +Intel 10G/25G SFP28 25GBASE-SR E25GSFP28SRX (Extended Temp) .El .Pp The .Nm -driver supports 10Gb and 1Gb Ethernet adapters with LR Modules: +driver supports 25Gb and 10Gb Ethernet adapters with these SFP+ modules: .Pp .Bl -bullet -compact .It -Intel DUAL RATE 1G/10G SFP+ LR (bailed) FTLX1471D3BCV-IT +Intel 1G/10G SFP+ SR FTLX8571D3BCV-IT .It -Intel DUAL RATE 1G/10G SFP+ LR (bailed) AFCT-701SDZ-IN2 +Intel 1G/10G SFP+ SR AFBR-703SDZ-IN2 +.It +Intel 1G/10G SFP+ LR FTLX1471D3BCV-IT +.It +Intel 1G/10G SFP+ LR AFCT-701SDZ-IN2 +.It +Intel 1G/10G SFP+ 10GBASE-SR E10GSFPSR +.It +Intel 10G SFP+ 10GBASE-SR E10GSFPSRX (Extended Temp) +.It +Intel 1G/10G SFP+ 10GBASE-LR E10GSFPLR .El .Pp -Note that X710/XL710 Based SFP+ adapters also support all passive and active +Note that adapters also support all passive and active limiting direct attach cables that comply with SFF-8431 v4.1 and SFF-8472 v10.4 specifications. +.Pp +This is not an exhaustive list; please consult product documentation for an +up-to-date list of supported media. .Sh LOADER TUNABLES Tunables can be set at the .Xr loader 8 prompt before booting the kernel or stored in .Xr loader.conf 5 . .Bl -tag -width indent -.It Va hw.ixl.enable_msix -Allows one to enable/disable MSIX, thus forcing MSI instead. -.It Va hw.ixl.ringsz -Set the number of descriptors in the rings, note that this -changes BOTH the TX and RX rings, they cannot be set independently. -.It Va hw.ixl.max_queues -Set the number of queues (each a TX/RX pair) for the port, this -allows one to override the autocalculation if it is set to 0. -.It Va hw.ixl.dynamic_rx_itr -The dynamic RX interrupt control, set to 1 to enable. -.It Va hw.ixl.dynamic_tx_itr -The dynamic TX interrupt control, set to 1 to enable. .It Va hw.ixl.rx_itr -The RX interrupt rate value, set to 8K by default. +The RX interrupt rate value, set to 62 (124 usec) by default. .It Va hw.ixl.tx_itr -The TX interrupt rate value, set to 4K by default. +The TX interrupt rate value, set to 122 (244 usec) by default. +.It Va hw.ixl.i2c_access_method +Access method that driver will use for I2C read and writes via +.Xr sysctl 8 +or verbose +.Xr ifconfig 8 +information display: +.Bd -literal -offset indent +0 - best available method +1 - bit bang via I2CPARAMS register +2 - register read/write via I2CCMD register +3 - Use Admin Queue command (default best) +.Ed +.Pp +Using the Admin Queue is only supported on 710 devices with FW version 1.7 or +newer. +Set to 0 by default. +.It Va hw.ixl.enable_tx_fc_filter +Filter out packets with Ethertype 0x8808 from being sent out by non-adapter +sources. +This prevents (potentially untrusted) software or +.Xr iavf 4 +devices from sending out flow control packets and creating a DoS (Denial of +Service) event. +Enabled by default. +.It Va hw.ixl.enable_head_writeback +When the driver is finding the last TX descriptor processed by the hardware, +use a value written to memory by the hardware instead of scanning the +descriptor ring for completed descriptors. +Enabled by default; disable to mimic the TX behavior found in +.Xr ixgbe 4 . .El .Sh SYSCTL PROCEDURES .Bl -tag -width indent -.It Va hw.ixl.fc -Allows one to set the flow control value. -A value of 0 disables -flow control, 3 enables full, 1 is RX, and 2 is TX pause. -.It Va hw.ixl.advertise_speed -Allows one to set advertised link speeds, this will then -cause a link renegotiation. -With the appropriate adapter -this can cause a link at 10GB, 1GB, or 100MB. -.It Va hw.ixl.current_speed -This is a display of the current setting. -.It Va hw.ixl.fw_version -This is a display of the Firmware version. +.It Va dev.ixl.#.fc +Sets the 802.3x flow control mode that the adapter will advertise on the link. +A value of 0 disables flow control, 3 enables full, 1 is RX, and 2 is TX pause. +.Pp +The negotiated flow control setting can be viewed in +.Xr ifconfig 8 , +in the interface's media field. +.It Va dev.ixl.#.advertise_speed +Set the speeds that the interface will advertise on the link. +.Va dev.ixl.#.supported_speeds +contains the speeds that are allowed to be set. +.It Va dev.ixl.#.current_speed +Displays the current speed. +.It Va dev.ixl.#.fw_version +Displays the current firmware and NVM versions of the adapter. .El -.Sh Interrupt Storms +.Sh INTERRUPT STORMS It is important to note that 40G operation can generate high numbers of interrupts, often incorrectly being interpreted as a storm condition in the kernel. -It is suggested that this -be resolved by setting: +It is suggested that this be resolved by setting: .Bl -tag -width indent .It Va hw.intr_storm_threshold: 0 .El +.Sh IOVCTL OPTIONS +The driver supports additional optional parameters for created VFs +(Virtual Functions) when using +.Xr iovctl 8 : +.Bl -tag -width indent +.It mac-addr Pq unicast-mac +Set the Ethernet MAC address that the VF will use. +If unspecified, the VF will use a randomly generated MAC address. +.It mac-anti-spoof Pq bool +Prevent the VF from sending Ethernet frames with a source address +that does not match its own. +.It allow-set-mac Pq bool +Allow the VF to set its own Ethernet MAC address +.It allow-promisc Pq bool +Allow the VF to inspect all of the traffic sent to the port. +.It num-queues Pq uint16_t +Specify the number of queues the VF will have. +By default, this is set to the number of MSI-X vectors supported by the VF +minus one. +.El +.Pp +An up to date list of parameters and their defaults can be found by using +.Xr iovctl 8 +with the -S option. .Sh SUPPORT For general information and support, go to the Intel support website at: @@ -168,24 +266,29 @@ go to the Intel support website at: .Pp If an issue is identified with this driver with a supported adapter, email all the specific information related to the issue to -.Aq freebsd@intel.com . +.Mt freebsd@intel.com . .Sh SEE ALSO .Xr arp 4 , -.Xr ixlv 4 , +.Xr iavf 4 , .Xr netintro 4 , -.Xr ng_ether 4 , .Xr vlan 4 , -.Xr ifconfig 8 +.Xr ifconfig 8 , +.Xr iovctl 8 , +.Xr iflib 9 .Sh HISTORY The .Nm device driver first appeared in .Fx 10.1 . +It was converted to use +.Xr iflib 9 +in +.Fx 12 . .Sh AUTHORS .An -nosplit The .Nm driver was written by -.An Jack Vogel Aq Mt jfv@FreeBSD.org +.An Jack Vogel Aq Mt jfv@freebsd.org and -.An Eric Joyner Aq Mt ricera10@gmail.com . +.An Eric Joyner Aq Mt erj@freebsd.org . From owner-svn-src-head@freebsd.org Fri Oct 12 23:48:11 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 51FD610CF0F8; Fri, 12 Oct 2018 23:48:11 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 02BEF7BC66; Fri, 12 Oct 2018 23:48:11 +0000 (UTC) (envelope-from mjg@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F1D322669B; Fri, 12 Oct 2018 23:48:10 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9CNmARU053830; Fri, 12 Oct 2018 23:48:10 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9CNmA3w053827; Fri, 12 Oct 2018 23:48:10 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201810122348.w9CNmA3w053827@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Fri, 12 Oct 2018 23:48:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339341 - in head/sys: kern sys X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys: kern sys X-SVN-Commit-Revision: 339341 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.27 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, 12 Oct 2018 23:48:11 -0000 Author: mjg Date: Fri Oct 12 23:48:10 2018 New Revision: 339341 URL: https://svnweb.freebsd.org/changeset/base/339341 Log: capsicum: provide cap_rights_fde_inline Reading caps is in the hot path (on each successful fd lookup), but completely unnecessarily requires a function call. Approved by: re (gjb) Sponsored by: The FreeBSD Foundation Modified: head/sys/kern/kern_descrip.c head/sys/kern/sys_capability.c head/sys/sys/capsicum.h Modified: head/sys/kern/kern_descrip.c ============================================================================== --- head/sys/kern/kern_descrip.c Fri Oct 12 22:57:52 2018 (r339340) +++ head/sys/kern/kern_descrip.c Fri Oct 12 23:48:10 2018 (r339341) @@ -2560,7 +2560,7 @@ fget_cap_locked(struct filedesc *fdp, int fd, cap_righ } #ifdef CAPABILITIES - error = cap_check(cap_rights_fde(fde), needrightsp); + error = cap_check(cap_rights_fde_inline(fde), needrightsp); if (error != 0) goto out; #endif @@ -2651,7 +2651,7 @@ fget_unlocked(struct filedesc *fdp, int fd, cap_rights #ifdef CAPABILITIES seq = seq_read(fd_seq(fdt, fd)); fde = &fdt->fdt_ofiles[fd]; - haverights = *cap_rights_fde(fde); + haverights = *cap_rights_fde_inline(fde); fp = fde->fde_file; if (!seq_consistent(fd_seq(fdt, fd), seq)) continue; Modified: head/sys/kern/sys_capability.c ============================================================================== --- head/sys/kern/sys_capability.c Fri Oct 12 22:57:52 2018 (r339340) +++ head/sys/kern/sys_capability.c Fri Oct 12 23:48:10 2018 (r339341) @@ -208,7 +208,7 @@ const cap_rights_t * cap_rights_fde(const struct filedescent *fdep) { - return (&fdep->fde_rights); + return (cap_rights_fde_inline(fdep)); } const cap_rights_t * Modified: head/sys/sys/capsicum.h ============================================================================== --- head/sys/sys/capsicum.h Fri Oct 12 22:57:52 2018 (r339340) +++ head/sys/sys/capsicum.h Fri Oct 12 23:48:10 2018 (r339341) @@ -465,7 +465,13 @@ u_char cap_rights_to_vmprot(const cap_rights_t *havep) /* * For the purposes of procstat(1) and similar tools, allow kern_descrip.c to * extract the rights from a capability. + * + * Dereferencing fdep requires filedesc.h, but including it would cause + * significant pollution. Instead add a macro for consumers which want it, + * most notably kern_descrip.c. */ +#define cap_rights_fde_inline(fdep) (&(fdep)->fde_rights) + const cap_rights_t *cap_rights_fde(const struct filedescent *fde); const cap_rights_t *cap_rights(struct filedesc *fdp, int fd); From owner-svn-src-head@freebsd.org Sat Oct 13 00:13:25 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B3B1B10D00CE; Sat, 13 Oct 2018 00:13:25 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6855C7D3AF; Sat, 13 Oct 2018 00:13:25 +0000 (UTC) (envelope-from np@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6339C26B88; Sat, 13 Oct 2018 00:13:25 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9D0DPFN069588; Sat, 13 Oct 2018 00:13:25 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9D0DPKO069587; Sat, 13 Oct 2018 00:13:25 GMT (envelope-from np@FreeBSD.org) Message-Id: <201810130013.w9D0DPKO069587@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Sat, 13 Oct 2018 00:13:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339342 - head/sys/dev/cxgbe X-SVN-Group: head X-SVN-Commit-Author: np X-SVN-Commit-Paths: head/sys/dev/cxgbe X-SVN-Commit-Revision: 339342 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.27 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: Sat, 13 Oct 2018 00:13:25 -0000 Author: np Date: Sat Oct 13 00:13:24 2018 New Revision: 339342 URL: https://svnweb.freebsd.org/changeset/base/339342 Log: cxgbe(4): Fix a divide-by-zero that occurs when hw.cxgbe.toecaps_allowed is set to 0 with a kernel that has both TCP_OFFLOAD and RATELIMIT. Approved by: re@ (gjb@) Sponsored by: Chelsio Communications Modified: head/sys/dev/cxgbe/t4_sge.c Modified: head/sys/dev/cxgbe/t4_sge.c ============================================================================== --- head/sys/dev/cxgbe/t4_sge.c Fri Oct 12 23:48:10 2018 (r339341) +++ head/sys/dev/cxgbe/t4_sge.c Sat Oct 13 00:13:24 2018 (r339342) @@ -1245,15 +1245,16 @@ t4_setup_vi_queues(struct vi_info *vi) snprintf(name, sizeof(name), "%s ofld_txq%d", device_get_nameunit(vi->dev), i); -#ifdef TCP_OFFLOAD - iqidx = vi->first_ofld_rxq + (i % vi->nofldrxq); - init_eq(sc, &ofld_txq->eq, EQ_OFLD, vi->qsize_txq, pi->tx_chan, - sc->sge.ofld_rxq[iqidx].iq.cntxt_id, name); -#else - iqidx = vi->first_rxq + (i % vi->nrxq); - init_eq(sc, &ofld_txq->eq, EQ_OFLD, vi->qsize_txq, pi->tx_chan, - sc->sge.rxq[iqidx].iq.cntxt_id, name); -#endif + if (vi->nofldrxq > 0) { + iqidx = vi->first_ofld_rxq + (i % vi->nofldrxq); + init_eq(sc, &ofld_txq->eq, EQ_OFLD, vi->qsize_txq, + pi->tx_chan, sc->sge.ofld_rxq[iqidx].iq.cntxt_id, + name); + } else { + iqidx = vi->first_rxq + (i % vi->nrxq); + init_eq(sc, &ofld_txq->eq, EQ_OFLD, vi->qsize_txq, + pi->tx_chan, sc->sge.rxq[iqidx].iq.cntxt_id, name); + } snprintf(name, sizeof(name), "%d", i); oid2 = SYSCTL_ADD_NODE(&vi->ctx, SYSCTL_CHILDREN(oid), OID_AUTO, From owner-svn-src-head@freebsd.org Sat Oct 13 02:20:17 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E68C910D4FE7; Sat, 13 Oct 2018 02:20:16 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 98C4C82596; Sat, 13 Oct 2018 02:20:16 +0000 (UTC) (envelope-from allanjude@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 930C53B5; Sat, 13 Oct 2018 02:20:16 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9D2KGAq030712; Sat, 13 Oct 2018 02:20:16 GMT (envelope-from allanjude@FreeBSD.org) Received: (from allanjude@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9D2KGwK030711; Sat, 13 Oct 2018 02:20:16 GMT (envelope-from allanjude@FreeBSD.org) Message-Id: <201810130220.w9D2KGwK030711@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: allanjude set sender to allanjude@FreeBSD.org using -f From: Allan Jude Date: Sat, 13 Oct 2018 02:20:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339343 - head/lib/libc/sys X-SVN-Group: head X-SVN-Commit-Author: allanjude X-SVN-Commit-Paths: head/lib/libc/sys X-SVN-Commit-Revision: 339343 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.27 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: Sat, 13 Oct 2018 02:20:17 -0000 Author: allanjude Date: Sat Oct 13 02:20:16 2018 New Revision: 339343 URL: https://svnweb.freebsd.org/changeset/base/339343 Log: Document that sendfile(2) can return ENOTCAPABLE PR: 232207 Submitted by: Enji Cooper Approved by: re (rgrimes) Modified: head/lib/libc/sys/sendfile.2 Modified: head/lib/libc/sys/sendfile.2 ============================================================================== --- head/lib/libc/sys/sendfile.2 Sat Oct 13 00:13:24 2018 (r339342) +++ head/lib/libc/sys/sendfile.2 Sat Oct 13 02:20:16 2018 (r339343) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 17, 2016 +.Dd October 12, 2018 .Dt SENDFILE 2 .Os .Sh NAME @@ -336,6 +336,12 @@ is negative. .It Bq Er EIO An error occurred while reading from .Fa fd . +.It Bq Er ENOTCAPABLE +The +.Fa fd +or the +.Fa s +argument has insufficient rights. .It Bq Er ENOBUFS The system was unable to allocate an internal buffer. .It Bq Er ENOTCONN From owner-svn-src-head@freebsd.org Sat Oct 13 02:21:24 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 901AE10D50CD; Sat, 13 Oct 2018 02:21:24 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46B2F828F1; Sat, 13 Oct 2018 02:21:24 +0000 (UTC) (envelope-from allanjude@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 41B853FB; Sat, 13 Oct 2018 02:21:24 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9D2LOVk032207; Sat, 13 Oct 2018 02:21:24 GMT (envelope-from allanjude@FreeBSD.org) Received: (from allanjude@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9D2LOEh032206; Sat, 13 Oct 2018 02:21:24 GMT (envelope-from allanjude@FreeBSD.org) Message-Id: <201810130221.w9D2LOEh032206@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: allanjude set sender to allanjude@FreeBSD.org using -f From: Allan Jude Date: Sat, 13 Oct 2018 02:21:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339344 - head/usr.sbin/mfiutil X-SVN-Group: head X-SVN-Commit-Author: allanjude X-SVN-Commit-Paths: head/usr.sbin/mfiutil X-SVN-Commit-Revision: 339344 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.27 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: Sat, 13 Oct 2018 02:21:24 -0000 Author: allanjude Date: Sat Oct 13 02:21:23 2018 New Revision: 339344 URL: https://svnweb.freebsd.org/changeset/base/339344 Log: Make `mfiutil show progress` print out the elapsed time estimate in a more humanized way PR: 225993 Submitted by: Enji Cooper Reviewed by: jhb (previous version) Approved by: re (rgrimes) Modified: head/usr.sbin/mfiutil/mfi_cmd.c Modified: head/usr.sbin/mfiutil/mfi_cmd.c ============================================================================== --- head/usr.sbin/mfiutil/mfi_cmd.c Sat Oct 13 02:20:16 2018 (r339343) +++ head/usr.sbin/mfiutil/mfi_cmd.c Sat Oct 13 02:21:23 2018 (r339344) @@ -31,17 +31,18 @@ * $FreeBSD$ */ -#include -#include #include +#include #include #include #include +#include #include #include #include #include +#include #include #include "mfiutil.h" @@ -311,24 +312,34 @@ mfi_open(int unit, int acs) return (open(path, acs)); } +static void +print_time_humanized(uint seconds) +{ + + if (seconds > 3600) { + printf("%u:", seconds / 3600); + } + if (seconds > 60) { + seconds %= 3600; + printf("%02u:%02u", seconds / 60, seconds % 60); + } else { + printf("%us", seconds); + } +} + void mfi_display_progress(const char *label, struct mfi_progress *prog) { uint seconds; - printf("%s: %.2f%% complete, after %ds", label, - (float)prog->progress * 100 / 0xffff, prog->elapsed_seconds); + printf("%s: %.2f%% complete after ", label, + (float)prog->progress * 100 / 0xffff); + print_time_humanized(prog->elapsed_seconds); if (prog->progress != 0 && prog->elapsed_seconds > 10) { printf(" finished in "); seconds = (0x10000 * (uint32_t)prog->elapsed_seconds) / prog->progress - prog->elapsed_seconds; - if (seconds > 3600) - printf("%u:", seconds / 3600); - if (seconds > 60) { - seconds %= 3600; - printf("%02u:%02u", seconds / 60, seconds % 60); - } else - printf("%us", seconds); + print_time_humanized(seconds); } printf("\n"); } From owner-svn-src-head@freebsd.org Sat Oct 13 16:25:29 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BA49910CEEDE; Sat, 13 Oct 2018 16:25:29 +0000 (UTC) (envelope-from yuripv@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 709A380EAB; Sat, 13 Oct 2018 16:25:29 +0000 (UTC) (envelope-from yuripv@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6787C11596; Sat, 13 Oct 2018 16:25:29 +0000 (UTC) (envelope-from yuripv@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9DGPTjw067959; Sat, 13 Oct 2018 16:25:29 GMT (envelope-from yuripv@FreeBSD.org) Received: (from yuripv@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9DGPTq7067958; Sat, 13 Oct 2018 16:25:29 GMT (envelope-from yuripv@FreeBSD.org) Message-Id: <201810131625.w9DGPTq7067958@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuripv set sender to yuripv@FreeBSD.org using -f From: Yuri Pankov Date: Sat, 13 Oct 2018 16:25:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339346 - head/lib/libc/stdtime X-SVN-Group: head X-SVN-Commit-Author: yuripv X-SVN-Commit-Paths: head/lib/libc/stdtime X-SVN-Commit-Revision: 339346 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.27 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: Sat, 13 Oct 2018 16:25:29 -0000 Author: yuripv Date: Sat Oct 13 16:25:28 2018 New Revision: 339346 URL: https://svnweb.freebsd.org/changeset/base/339346 Log: strptime: disallow zero hour for %I (defined by POSIX as [01,12]) and %l (extension, defined in strftime(3) as 1-12). Approved by: re (gjb), kib (mentor) Differential Revision: https://reviews.freebsd.org/D17543 Modified: head/lib/libc/stdtime/strptime.c Modified: head/lib/libc/stdtime/strptime.c ============================================================================== --- head/lib/libc/stdtime/strptime.c Sat Oct 13 03:12:57 2018 (r339345) +++ head/lib/libc/stdtime/strptime.c Sat Oct 13 16:25:28 2018 (r339346) @@ -291,7 +291,7 @@ label: if (c == 'H' || c == 'k') { if (i > 23) return (NULL); - } else if (i > 12) + } else if (i == 0 || i > 12) return (NULL); tm->tm_hour = i; From owner-svn-src-head@freebsd.org Sat Oct 13 20:01:49 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 93DC910D40CF; Sat, 13 Oct 2018 20:01:49 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 35BEE8849E; Sat, 13 Oct 2018 20:01:49 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (unknown [127.0.1.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id DD69274EA; Sat, 13 Oct 2018 20:01:48 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id DC74F1E15; Sat, 13 Oct 2018 20:01:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id fBxD-xMlQ3pf; Sat, 13 Oct 2018 20:01:45 +0000 (UTC) Subject: Re: svn commit: r339326 - head DKIM-Filter: OpenDKIM Filter v2.10.3 mail.xzibition.com B72211E09 To: Kyle Evans , =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201810120542.w9C5gcW0095391@repo.freebsd.org> From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Autocrypt: addr=bdrewery@FreeBSD.org; prefer-encrypt=mutual; keydata= xsBNBFJphmsBCADiFgmS4bIzwZijrS31SjEMzg+n5zNellgM+HkShwehpqCiyhXdWrvH6dTZ a6u50pbUIX7doTR7W7PQHCjCTqtpwvcj0eulZva+iHFp+XrbgSFHn+VVXgkYP2MFySyZRFab D2qqzJBEJofhpv4HvY6uQI5K99pMqKr1Z/lHqsijYYu4RH2OfwB5PinId7xeldzWEonVoCr+ rfxzO/UrgA6v/3layGZcKNHFjmc3NqoN1DXtdaEHqtjIozzbndVkH6lkFvIpIrI6i5ox8pwp VxsxLCr/4Musd5CWgHiet5kSw2SzNeA8FbxdLYCpXNVu+uBACEbCUP+CSNy3NVfEUxsBABEB AAHNJEJyeWFuIERyZXdlcnkgPGJkcmV3ZXJ5QEZyZWVCU0Qub3JnPsLAgAQTAQoAKgIbAwUL CQgHAwUVCgkICwUWAwIBAAIeAQIXgAIZAQUCWujOIgUJCmB7NwAKCRA113G7bkaXz/xpB/9b /UWIPbieY1IeIuHF2pyYPE7Hytkh3HVsxMA0F5Ma2AYQsXZZeKNKWrF7RPyDyDwUklLHJkhm k3EfClBbHxf08kMIm1vWCJRtgxic9knY/bzYGiWMpHjg3cSd1XfrYH1autYqTZAjDwIkgOjU dR//Tbn4V36sY7y2jz+kdMVWvK53U32aZqiwBbCn4DPe1wSZcUs17mV/0uZdIoGdj74B1orN A/0py5vHYo6HcbBNoaR8pKRLf5VZNRsxqGIMhTucx4SJWcHpuRBWYyvJSFzwvxdK4ZD4Yqoc kFGPVtOXktVMai9exrLvP3G77fKMu8DI6j4QRU4wCesnHuIfRPFuzsBNBFJphmsBCACiVFPf kNfaFtUSuY0395ueo/rMyHPGPQ2iwvERFCpeFGSQSgagpenNHLpFQKTg/dl6FOoST5tqyxMq fyHGHDzzU51bvA/IfaGoNi/BIhTe/toZNMRvpcI3PLjiGcnJnuwCCbAVOAGdb+t5cZtpNdOI cKYmrYG3u9RiBpe6dTF+qLrD/8Bs1wjhduQ8fcNNgnkXu8xDH4ZxY0lIc3QgvYWp9vimlQe6 iKjUd2/DX28ETZcD5h6pYV331KMPTrEI0p0yvFijUZce8c1XHFyL1j9sBAha5qpszJl6Uq5i LolhKRcGfcdmtD72vHQjUYglUyudSJUVyo2gMYjdbiFKzJulABEBAAHCwGUEGAEKAA8CGwwF AlrozigFCQpgez0ACgkQNddxu25Gl8+m5Af/R3VEdxNMAcDIes9ADhQyofj20SPV3eCJ3HYR OebTSuNdOudGt4AAyA8Ks94u9hiIp5IGsc6RDsT9W7O2vgXhd6eV3eiY5Oif5xLIYrIDVu1Y 1GyRxRrPEn/QOqDN6uFZCPwK1aOapGcYCrO9lB0gMuTVfgHanU61rgC9tMX0OoAOyRd+V3/M 8lDNhjJdF/IpO3SdYzKfkwduy4qamw4Gphcx/RfYQvYLq/eDkP8d50PphWdboqWBwNRHayro W/07OGzfxM5fJ5mBsXPQcO2QcRjkyHf6xCM6Hi1qQL4OnXMNE/ZTX0lnOj1/pH93TlzSHZMP TaiiA/MBD3vGsXBmBg== Organization: FreeBSD Message-ID: <4640c2d3-92a9-4d42-e5c8-6d16f5aeead3@FreeBSD.org> Date: Sat, 13 Oct 2018 13:01:36 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="HwCxUXJfFXYQPbFVhyG4OUptSOmSdxGly" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 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: Sat, 13 Oct 2018 20:01:49 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --HwCxUXJfFXYQPbFVhyG4OUptSOmSdxGly Content-Type: multipart/mixed; boundary="7CmEkUhdyv7Jnf5V803Aqn8dtwI7or7sc"; protected-headers="v1" From: Bryan Drewery To: Kyle Evans , =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <4640c2d3-92a9-4d42-e5c8-6d16f5aeead3@FreeBSD.org> Subject: Re: svn commit: r339326 - head References: <201810120542.w9C5gcW0095391@repo.freebsd.org> In-Reply-To: --7CmEkUhdyv7Jnf5V803Aqn8dtwI7or7sc Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 10/12/2018 4:33 AM, Kyle Evans wrote: > On Fri, Oct 12, 2018 at 12:43 AM Dag-Erling Sm=C3=B8rgrav wrote: >> >> Author: des >> Date: Fri Oct 12 05:42:38 2018 >> New Revision: 339326 >> URL: https://svnweb.freebsd.org/changeset/base/339326 >> >> Log: >> Move libssl up in the bootstrap order. >> >> Submitted by: jkim >> Approved by: re (gjb) >> >> Modified: >> head/Makefile.inc1 >> >> Modified: head/Makefile.inc1 >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/Makefile.inc1 Fri Oct 12 05:27:58 2018 (r339325) >> +++ head/Makefile.inc1 Fri Oct 12 05:42:38 2018 (r339326) >> @@ -2534,8 +2534,8 @@ _prebuild_libs=3D ${_kerberos5_lib_libasn1} \ >> ${_cddl_lib_libctf} \ >> lib/libufs \ >> lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz l= ib/msun \ >> - ${_secure_lib_libcrypto} ${_lib_libldns} \ >> - ${_secure_lib_libssh} ${_secure_lib_libssl} >> + ${_secure_lib_libcrypto} ${_secure_lib_libssl} \ >> + ${_lib_libldns} ${_secure_lib_libssh} >> >> .if ${MK_GNUCXX} !=3D "no" >> _prebuild_libs+=3D gnu/lib/libstdc++ gnu/lib/libsupc++ >> _______________________________________________ >=20 > Hmm... doesn't this kind of situation also require an __L rule down > below to prevent the race, since they're both in prebuild_libs? >=20 > Thanks, >=20 Yes, this list is not an ordering. It's just a list. The ordering comes from __L targets which define the dependency graph. --=20 Regards, Bryan Drewery --7CmEkUhdyv7Jnf5V803Aqn8dtwI7or7sc-- --HwCxUXJfFXYQPbFVhyG4OUptSOmSdxGly Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE+Rc8ssOq6npcih8JNddxu25Gl88FAlvCTyBfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEY5 MTczQ0IyQzNBQUVBN0E1QzhBMUYwOTM1RDc3MUJCNkU0Njk3Q0YACgkQNddxu25G l8/QlAf/UQCd7NSMgyDUWNI1KfahCOlYuPSx+XYcMzPwgJyIynA6hudCLC8f5AyI shkfd8lrBAFTJ7yZI8X++CniWfaAUtrwr4PNhtyct2GdsEHsZoBThFLkWOU+bf83 X6wW73OJZQZmEhmv/ob8MkwdEOz1UXZbZe+b4cB8Ozd2mkezQGaGNJqnRcIAFp8A gRcfCMDwQr0xbNQ6PhN0odBbcwDeF9qK7z8R4xoIR/CnzmZGH4mpkSxwHkfYmLbV NWfDzAIHiEaPSf4gDDtAmO5SYHdyPlz8SXNtU+7UdOeMwa2oOVe+ACYe7WN/VeOv FVIAvrCgoVs/W8kNmmTPDXR8/Ej/mg== =uxwA -----END PGP SIGNATURE----- --HwCxUXJfFXYQPbFVhyG4OUptSOmSdxGly-- From owner-svn-src-head@freebsd.org Sat Oct 13 21:15:48 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7A05510D55C6; Sat, 13 Oct 2018 21:15:48 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 22BB18A7A2; Sat, 13 Oct 2018 21:15:48 +0000 (UTC) (envelope-from mjg@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0F252145BC; Sat, 13 Oct 2018 21:15:48 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9DLFlth017189; Sat, 13 Oct 2018 21:15:47 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9DLFlZK017187; Sat, 13 Oct 2018 21:15:47 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201810132115.w9DLFlZK017187@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Sat, 13 Oct 2018 21:15:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339347 - head/lib/libc/amd64/string X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/lib/libc/amd64/string X-SVN-Commit-Revision: 339347 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.27 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: Sat, 13 Oct 2018 21:15:48 -0000 Author: mjg Date: Sat Oct 13 21:15:47 2018 New Revision: 339347 URL: https://svnweb.freebsd.org/changeset/base/339347 Log: amd64: import updated kernel memmove to libc bcopy is left alone as it is expected to be converted to a C func. Due to header mess ALIGN_TEXT is temporarily defined explicitly in memmove.S Reviewed by: kib Approved by: re (gjb) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D17538 Modified: head/lib/libc/amd64/string/memcpy.S head/lib/libc/amd64/string/memmove.S Modified: head/lib/libc/amd64/string/memcpy.S ============================================================================== --- head/lib/libc/amd64/string/memcpy.S Sat Oct 13 16:25:28 2018 (r339346) +++ head/lib/libc/amd64/string/memcpy.S Sat Oct 13 21:15:47 2018 (r339347) @@ -1,5 +1,5 @@ /* $NetBSD: memcpy.S,v 1.1 2001/06/19 00:25:05 fvdl Exp $ */ /* $FreeBSD$ */ -#define MEMCOPY -#include "bcopy.S" +#define MEMCPY +#include "memmove.S" Modified: head/lib/libc/amd64/string/memmove.S ============================================================================== --- head/lib/libc/amd64/string/memmove.S Sat Oct 13 16:25:28 2018 (r339346) +++ head/lib/libc/amd64/string/memmove.S Sat Oct 13 21:15:47 2018 (r339347) @@ -1,5 +1,270 @@ -/* $NetBSD: memmove.S,v 1.1 2001/06/19 00:25:05 fvdl Exp $ */ -/* $FreeBSD$ */ +/*- + * Copyright (c) 2018 The FreeBSD Foundation + * + * This software was developed by Mateusz Guzik + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ -#define MEMMOVE -#include "bcopy.S" +#include +__FBSDID("$FreeBSD$"); + +#define ALIGN_TEXT .p2align 4,0x90 /* 16-byte alignment, nop filled */ + +/* + * memmove(dst, src, cnt) + * rdi, rsi, rdx + * Contains parts of bcopy written by: + * ws@tools.de (Wolfgang Solfrank, TooLs GmbH) +49-228-985800 + */ + +/* + * Register state at entry is supposed to be as follows: + * rdi - destination + * rsi - source + * rdx - count + * + * The macro possibly clobbers the above and: rcx, r8. + * It does not clobber rax, r10 nor r11. + */ +.macro MEMMOVE erms overlap begin end + \begin +.if \overlap == 1 + movq %rdi,%r8 + subq %rsi,%r8 + cmpq %rcx,%r8 /* overlapping && src < dst? */ + jb 2f +.endif + + cmpq $32,%rcx + jb 1016f + + cmpq $256,%rcx + ja 1256f + +1032: + movq (%rsi),%rdx + movq %rdx,(%rdi) + movq 8(%rsi),%rdx + movq %rdx,8(%rdi) + movq 16(%rsi),%rdx + movq %rdx,16(%rdi) + movq 24(%rsi),%rdx + movq %rdx,24(%rdi) + leaq 32(%rsi),%rsi + leaq 32(%rdi),%rdi + subq $32,%rcx + cmpq $32,%rcx + jae 1032b + cmpb $0,%cl + jne 1016f + \end + ret + ALIGN_TEXT +1016: + cmpb $16,%cl + jl 1008f + movq (%rsi),%rdx + movq %rdx,(%rdi) + movq 8(%rsi),%rdx + movq %rdx,8(%rdi) + subb $16,%cl + jz 1000f + leaq 16(%rsi),%rsi + leaq 16(%rdi),%rdi +1008: + cmpb $8,%cl + jl 1004f + movq (%rsi),%rdx + movq %rdx,(%rdi) + subb $8,%cl + jz 1000f + leaq 8(%rsi),%rsi + leaq 8(%rdi),%rdi +1004: + cmpb $4,%cl + jl 1002f + movl (%rsi),%edx + movl %edx,(%rdi) + subb $4,%cl + jz 1000f + leaq 4(%rsi),%rsi + leaq 4(%rdi),%rdi +1002: + cmpb $2,%cl + jl 1001f + movw (%rsi),%dx + movw %dx,(%rdi) + subb $2,%cl + jz 1000f + leaq 2(%rsi),%rsi + leaq 2(%rdi),%rdi +1001: + cmpb $1,%cl + jl 1000f + movb (%rsi),%dl + movb %dl,(%rdi) +1000: + \end + ret + + ALIGN_TEXT +1256: +.if \erms == 1 + rep + movsb +.else + shrq $3,%rcx /* copy by 64-bit words */ + rep + movsq + movq %rdx,%rcx + andb $7,%cl /* any bytes left? */ + jne 1004b +.endif + \end + ret + +.if \overlap == 1 + /* + * Copy backwards. + */ + ALIGN_TEXT +2: + addq %rcx,%rdi + addq %rcx,%rsi + + cmpq $32,%rcx + jb 2016f + + cmpq $256,%rcx + ja 2256f + +2032: + movq -8(%rsi),%rdx + movq %rdx,-8(%rdi) + movq -16(%rsi),%rdx + movq %rdx,-16(%rdi) + movq -24(%rsi),%rdx + movq %rdx,-24(%rdi) + movq -32(%rsi),%rdx + movq %rdx,-32(%rdi) + leaq -32(%rsi),%rsi + leaq -32(%rdi),%rdi + subq $32,%rcx + cmpq $32,%rcx + jae 2032b + cmpb $0,%cl + jne 2016f + \end + ret + ALIGN_TEXT +2016: + cmpb $16,%cl + jl 2008f + movq -8(%rsi),%rdx + movq %rdx,-8(%rdi) + movq -16(%rsi),%rdx + movq %rdx,-16(%rdi) + subb $16,%cl + jz 2000f + leaq -16(%rsi),%rsi + leaq -16(%rdi),%rdi +2008: + cmpb $8,%cl + jl 2004f + movq -8(%rsi),%rdx + movq %rdx,-8(%rdi) + subb $8,%cl + jz 2000f + leaq -8(%rsi),%rsi + leaq -8(%rdi),%rdi +2004: + cmpb $4,%cl + jl 2002f + movl -4(%rsi),%edx + movl %edx,-4(%rdi) + subb $4,%cl + jz 2000f + leaq -4(%rsi),%rsi + leaq -4(%rdi),%rdi +2002: + cmpb $2,%cl + jl 2001f + movw -2(%rsi),%dx + movw %dx,-2(%rdi) + subb $2,%cl + jz 2000f + leaq -2(%rsi),%rsi + leaq -2(%rdi),%rdi +2001: + cmpb $1,%cl + jl 2000f + movb -1(%rsi),%dl + movb %dl,-1(%rdi) +2000: + \end + ret + ALIGN_TEXT +2256: + decq %rdi + decq %rsi + std +.if \erms == 1 + rep + movsb +.else + andq $7,%rcx /* any fractional bytes? */ + je 3f + rep + movsb +3: + movq %rdx,%rcx /* copy remainder by 32-bit words */ + shrq $3,%rcx + subq $7,%rsi + subq $7,%rdi + rep + movsq +.endif + cld + \end + ret +.endif +.endm + +.macro MEMMOVE_BEGIN + movq %rdi,%rax + movq %rdx,%rcx +.endm + +.macro MEMMOVE_END +.endm + +#ifndef MEMCPY +ENTRY(memmove) + MEMMOVE erms=0 overlap=1 begin=MEMMOVE_BEGIN end=MEMMOVE_END +END(memmove) +#else +ENTRY(memcpy) + MEMMOVE erms=0 overlap=1 begin=MEMMOVE_BEGIN end=MEMMOVE_END +END(memcpy) +#endif From owner-svn-src-head@freebsd.org Sat Oct 13 21:17:29 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8127B10D563E; Sat, 13 Oct 2018 21:17:29 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 327DD8A928; Sat, 13 Oct 2018 21:17:29 +0000 (UTC) (envelope-from mjg@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2CCB0145C3; Sat, 13 Oct 2018 21:17:29 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9DLHTV1017300; Sat, 13 Oct 2018 21:17:29 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9DLHSg7017299; Sat, 13 Oct 2018 21:17:28 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201810132117.w9DLHSg7017299@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Sat, 13 Oct 2018 21:17:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339348 - head/lib/libc/amd64/string X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/lib/libc/amd64/string X-SVN-Commit-Revision: 339348 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.27 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: Sat, 13 Oct 2018 21:17:29 -0000 Author: mjg Date: Sat Oct 13 21:17:28 2018 New Revision: 339348 URL: https://svnweb.freebsd.org/changeset/base/339348 Log: amd64: convert libc bcopy to a C func to avoid future bloat The function is of limited use and is an almost a direct clone of memmove/memcpy (with arguments swapped). Introduction of ERMS variants of string routines would mean avoidable growth of libc. bcopy will get redefined to a __builtin_memmove later on with this symbol only left for compatibility. Reviewed by: kib Approved by: re (gjb) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D17539 Added: head/lib/libc/amd64/string/bcopy.c (contents, props changed) Deleted: head/lib/libc/amd64/string/bcopy.S Modified: head/lib/libc/amd64/string/Makefile.inc Modified: head/lib/libc/amd64/string/Makefile.inc ============================================================================== --- head/lib/libc/amd64/string/Makefile.inc Sat Oct 13 21:15:47 2018 (r339347) +++ head/lib/libc/amd64/string/Makefile.inc Sat Oct 13 21:17:28 2018 (r339348) @@ -2,7 +2,6 @@ MDSRCS+= \ bcmp.S \ - bcopy.S \ bzero.S \ memcmp.S \ memcpy.S \ Added: head/lib/libc/amd64/string/bcopy.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libc/amd64/string/bcopy.c Sat Oct 13 21:17:28 2018 (r339348) @@ -0,0 +1,15 @@ +/*- + * Public domain. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include + +void +bcopy(const void *src, void *dst, size_t len) +{ + + memmove(dst, src, len); +} From owner-svn-src-head@freebsd.org Sat Oct 13 21:18:33 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1B73110D56C2; Sat, 13 Oct 2018 21:18:33 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C104B8AB37; Sat, 13 Oct 2018 21:18:32 +0000 (UTC) (envelope-from mjg@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BBF21145C7; Sat, 13 Oct 2018 21:18:32 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9DLIWqo017394; Sat, 13 Oct 2018 21:18:32 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9DLIW3R017391; Sat, 13 Oct 2018 21:18:32 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201810132118.w9DLIW3R017391@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Sat, 13 Oct 2018 21:18:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339349 - in head/sys/amd64: amd64 include X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/amd64: amd64 include X-SVN-Commit-Revision: 339349 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.27 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: Sat, 13 Oct 2018 21:18:33 -0000 Author: mjg Date: Sat Oct 13 21:18:31 2018 New Revision: 339349 URL: https://svnweb.freebsd.org/changeset/base/339349 Log: amd64: partially depessimize cpu_fetch_syscall_args and cpu_set_syscall_retval Vast majority of syscalls take 6 or less arguments. Move handling of other cases to a fallback function. Similarly, special casing for _syscall and __syscall magic syscalls is moved away. Return is almost always 0. The change replaces 3 branches with 1 in the common case. Also the 'frame' variable convinces clang not to reload it on each access. Reviewed by: kib Approved by: re (gjb) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D17542 Modified: head/sys/amd64/amd64/trap.c head/sys/amd64/amd64/vm_machdep.c head/sys/amd64/include/proc.h Modified: head/sys/amd64/amd64/trap.c ============================================================================== --- head/sys/amd64/amd64/trap.c Sat Oct 13 21:17:28 2018 (r339348) +++ head/sys/amd64/amd64/trap.c Sat Oct 13 21:18:31 2018 (r339349) @@ -970,21 +970,19 @@ dblfault_handler(struct trapframe *frame) panic("double fault"); } -int -cpu_fetch_syscall_args(struct thread *td) +static int __noinline +cpu_fetch_syscall_args_fallback(struct thread *td, struct syscall_args *sa) { struct proc *p; struct trapframe *frame; register_t *argp; - struct syscall_args *sa; caddr_t params; int reg, regcnt, error; p = td->td_proc; frame = td->td_frame; - sa = &td->td_sa; reg = 0; - regcnt = 6; + regcnt = NARGREGS; sa->code = frame->tf_rax; @@ -1002,24 +1000,58 @@ cpu_fetch_syscall_args(struct thread *td) sa->callp = &p->p_sysent->sv_table[sa->code]; sa->narg = sa->callp->sy_narg; - KASSERT(sa->narg <= sizeof(sa->args) / sizeof(sa->args[0]), - ("Too many syscall arguments!")); - error = 0; + KASSERT(sa->narg <= nitems(sa->args), ("Too many syscall arguments!")); argp = &frame->tf_rdi; argp += reg; - memcpy(sa->args, argp, sizeof(sa->args[0]) * 6); + memcpy(sa->args, argp, sizeof(sa->args[0]) * NARGREGS); if (sa->narg > regcnt) { params = (caddr_t)frame->tf_rsp + sizeof(register_t); error = copyin(params, &sa->args[regcnt], (sa->narg - regcnt) * sizeof(sa->args[0])); + if (__predict_false(error != 0)) + return (error); } - if (error == 0) { - td->td_retval[0] = 0; - td->td_retval[1] = frame->tf_rdx; - } + td->td_retval[0] = 0; + td->td_retval[1] = frame->tf_rdx; - return (error); + return (0); +} + +int +cpu_fetch_syscall_args(struct thread *td) +{ + struct proc *p; + struct trapframe *frame; + struct syscall_args *sa; + + p = td->td_proc; + frame = td->td_frame; + sa = &td->td_sa; + + sa->code = frame->tf_rax; + + if (__predict_false(sa->code == SYS_syscall || + sa->code == SYS___syscall || + sa->code >= p->p_sysent->sv_size)) + return (cpu_fetch_syscall_args_fallback(td, sa)); + + sa->callp = &p->p_sysent->sv_table[sa->code]; + sa->narg = sa->callp->sy_narg; + KASSERT(sa->narg <= nitems(sa->args), ("Too many syscall arguments!")); + + if (p->p_sysent->sv_mask) + sa->code &= p->p_sysent->sv_mask; + + if (__predict_false(sa->narg > NARGREGS)) + return (cpu_fetch_syscall_args_fallback(td, sa)); + + memcpy(sa->args, &frame->tf_rdi, sizeof(sa->args[0]) * NARGREGS); + + td->td_retval[0] = 0; + td->td_retval[1] = frame->tf_rdx; + + return (0); } #include "../../kern/subr_syscall.c" Modified: head/sys/amd64/amd64/vm_machdep.c ============================================================================== --- head/sys/amd64/amd64/vm_machdep.c Sat Oct 13 21:17:28 2018 (r339348) +++ head/sys/amd64/amd64/vm_machdep.c Sat Oct 13 21:18:31 2018 (r339349) @@ -372,14 +372,17 @@ cpu_thread_free(struct thread *td) void cpu_set_syscall_retval(struct thread *td, int error) { + struct trapframe *frame; - switch (error) { - case 0: - td->td_frame->tf_rax = td->td_retval[0]; - td->td_frame->tf_rdx = td->td_retval[1]; - td->td_frame->tf_rflags &= ~PSL_C; - break; + frame = td->td_frame; + if (__predict_true(error == 0)) { + frame->tf_rax = td->td_retval[0]; + frame->tf_rdx = td->td_retval[1]; + frame->tf_rflags &= ~PSL_C; + return; + } + switch (error) { case ERESTART: /* * Reconstruct pc, we know that 'syscall' is 2 bytes, @@ -393,8 +396,8 @@ cpu_set_syscall_retval(struct thread *td, int error) * Require full context restore to get the arguments * in the registers reloaded at return to usermode. */ - td->td_frame->tf_rip -= td->td_frame->tf_err; - td->td_frame->tf_r10 = td->td_frame->tf_rcx; + frame->tf_rip -= frame->tf_err; + frame->tf_r10 = frame->tf_rcx; set_pcb_flags(td->td_pcb, PCB_FULL_IRET); break; @@ -402,8 +405,8 @@ cpu_set_syscall_retval(struct thread *td, int error) break; default: - td->td_frame->tf_rax = SV_ABI_ERRNO(td->td_proc, error); - td->td_frame->tf_rflags |= PSL_C; + frame->tf_rax = SV_ABI_ERRNO(td->td_proc, error); + frame->tf_rflags |= PSL_C; break; } } Modified: head/sys/amd64/include/proc.h ============================================================================== --- head/sys/amd64/include/proc.h Sat Oct 13 21:17:28 2018 (r339348) +++ head/sys/amd64/include/proc.h Sat Oct 13 21:18:31 2018 (r339349) @@ -101,6 +101,9 @@ int amd64_set_ldt_data(struct thread *td, int start, i extern struct mtx dt_lock; extern int max_ldt_segment; + +#define NARGREGS 6 + #endif /* _KERNEL */ #endif /* !_MACHINE_PROC_H_ */ From owner-svn-src-head@freebsd.org Sat Oct 13 21:26:08 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 20FA410D59BD; Sat, 13 Oct 2018 21:26:08 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CA3928B0F1; Sat, 13 Oct 2018 21:26:07 +0000 (UTC) (envelope-from emaste@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C521314771; Sat, 13 Oct 2018 21:26:07 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9DLQ7xg022497; Sat, 13 Oct 2018 21:26:07 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9DLQ73C022496; Sat, 13 Oct 2018 21:26:07 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201810132126.w9DLQ73C022496@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sat, 13 Oct 2018 21:26:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339350 - head/contrib/elftoolchain/elfcopy X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/contrib/elftoolchain/elfcopy X-SVN-Commit-Revision: 339350 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.27 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: Sat, 13 Oct 2018 21:26:08 -0000 Author: emaste Date: Sat Oct 13 21:26:07 2018 New Revision: 339350 URL: https://svnweb.freebsd.org/changeset/base/339350 Log: elfcopy: delete filter_reloc, it is broken and unnecessary elfcopy contained logic to filter individual relocations in STRIP_ALL mode. However, this is not valid; relocations emitted by the linker are required, unless they apply to an entire section being removed (which is handled by other logic in elfcopy). Note that filter_reloc was also buggy: for RELA relocation sections it operated on uninitialized rel.r_info resulting in invalid operation. The logic most likely needs to be inverted: instead of removing relocations because their associated symbols are being removed, we must keep symbols referenced by relocations. That said, in practice we do not encounter this code path today: objects being stripped are either dynamically linked binaries which retain .dynsym, or static binaries with no relocations. Just remove filter_reloc. This fixes certain cases including statically linked binaries containing ifuncs. Stripping binaries with relocations referencing removed symbols was already broken, and after this change may still be broken in a different way. PR: 232176 Reviewed by: kaiw, kib, markj Approved by: re (rgrimes) MFC after: 1 month Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D17519 Modified: head/contrib/elftoolchain/elfcopy/sections.c Modified: head/contrib/elftoolchain/elfcopy/sections.c ============================================================================== --- head/contrib/elftoolchain/elfcopy/sections.c Sat Oct 13 21:18:31 2018 (r339349) +++ head/contrib/elftoolchain/elfcopy/sections.c Sat Oct 13 21:26:07 2018 (r339350) @@ -39,7 +39,6 @@ ELFTC_VCSID("$Id: sections.c 3443 2016-04-15 18:57:54Z static void add_gnu_debuglink(struct elfcopy *ecp); static uint32_t calc_crc32(const char *p, size_t len, uint32_t crc); static void check_section_rename(struct elfcopy *ecp, struct section *s); -static void filter_reloc(struct elfcopy *ecp, struct section *s); static int get_section_flags(struct elfcopy *ecp, const char *name); static void insert_sections(struct elfcopy *ecp); static void insert_to_strtab(struct section *t, const char *s); @@ -574,14 +573,6 @@ copy_content(struct elfcopy *ecp) continue; /* - * If strip action is STRIP_ALL, relocation info need - * to be stripped. Skip filtering otherwisw. - */ - if (ecp->strip == STRIP_ALL && - (s->type == SHT_REL || s->type == SHT_RELA)) - filter_reloc(ecp, s); - - /* * The section indices in the SHT_GROUP section needs * to be updated since we might have stripped some * sections and changed section numbering. @@ -670,125 +661,6 @@ update_section_group(struct elfcopy *ecp, struct secti s->sz -= 4; } - s->nocopy = 1; -} - -/* - * Filter relocation entries, only keep those entries whose - * symbol is in the keep list. - */ -static void -filter_reloc(struct elfcopy *ecp, struct section *s) -{ - const char *name; - GElf_Shdr ish; - GElf_Rel rel; - GElf_Rela rela; - Elf32_Rel *rel32; - Elf64_Rel *rel64; - Elf32_Rela *rela32; - Elf64_Rela *rela64; - Elf_Data *id; - uint64_t cap, n, nrels; - int elferr, i; - - if (gelf_getshdr(s->is, &ish) == NULL) - errx(EXIT_FAILURE, "gelf_getehdr() failed: %s", - elf_errmsg(-1)); - - /* We don't want to touch relocation info for dynamic symbols. */ - if ((ecp->flags & SYMTAB_EXIST) == 0) { - if (ish.sh_link == 0 || ecp->secndx[ish.sh_link] == 0) { - /* - * This reloc section applies to the symbol table - * that was stripped, so discard whole section. - */ - s->nocopy = 1; - s->sz = 0; - } - return; - } else { - /* Symbol table exist, check if index equals. */ - if (ish.sh_link != elf_ndxscn(ecp->symtab->is)) - return; - } - -#define COPYREL(REL, SZ) do { \ - if (nrels == 0) { \ - if ((REL##SZ = malloc(cap * \ - sizeof(*REL##SZ))) == NULL) \ - err(EXIT_FAILURE, "malloc failed"); \ - } \ - if (nrels >= cap) { \ - cap *= 2; \ - if ((REL##SZ = realloc(REL##SZ, cap * \ - sizeof(*REL##SZ))) == NULL) \ - err(EXIT_FAILURE, "realloc failed"); \ - } \ - REL##SZ[nrels].r_offset = REL.r_offset; \ - REL##SZ[nrels].r_info = REL.r_info; \ - if (s->type == SHT_RELA) \ - rela##SZ[nrels].r_addend = rela.r_addend; \ - nrels++; \ -} while (0) - - nrels = 0; - cap = 4; /* keep list is usually small. */ - rel32 = NULL; - rel64 = NULL; - rela32 = NULL; - rela64 = NULL; - if ((id = elf_getdata(s->is, NULL)) == NULL) - errx(EXIT_FAILURE, "elf_getdata() failed: %s", - elf_errmsg(-1)); - n = ish.sh_size / ish.sh_entsize; - for(i = 0; (uint64_t)i < n; i++) { - if (s->type == SHT_REL) { - if (gelf_getrel(id, i, &rel) != &rel) - errx(EXIT_FAILURE, "gelf_getrel failed: %s", - elf_errmsg(-1)); - } else { - if (gelf_getrela(id, i, &rela) != &rela) - errx(EXIT_FAILURE, "gelf_getrel failed: %s", - elf_errmsg(-1)); - } - name = elf_strptr(ecp->ein, elf_ndxscn(ecp->strtab->is), - GELF_R_SYM(rel.r_info)); - if (name == NULL) - errx(EXIT_FAILURE, "elf_strptr failed: %s", - elf_errmsg(-1)); - if (lookup_symop_list(ecp, name, SYMOP_KEEP) != NULL) { - if (ecp->oec == ELFCLASS32) { - if (s->type == SHT_REL) - COPYREL(rel, 32); - else - COPYREL(rela, 32); - } else { - if (s->type == SHT_REL) - COPYREL(rel, 64); - else - COPYREL(rela, 64); - } - } - } - elferr = elf_errno(); - if (elferr != 0) - errx(EXIT_FAILURE, "elf_getdata() failed: %s", - elf_errmsg(elferr)); - - if (ecp->oec == ELFCLASS32) { - if (s->type == SHT_REL) - s->buf = rel32; - else - s->buf = rela32; - } else { - if (s->type == SHT_REL) - s->buf = rel64; - else - s->buf = rela64; - } - s->sz = gelf_fsize(ecp->eout, (s->type == SHT_REL ? ELF_T_REL : - ELF_T_RELA), nrels, EV_CURRENT); s->nocopy = 1; } From owner-svn-src-head@freebsd.org Sat Oct 13 23:52:58 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BD29D10D82F7; Sat, 13 Oct 2018 23:52:58 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6EC2B8EA70; Sat, 13 Oct 2018 23:52:58 +0000 (UTC) (envelope-from kib@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6872E16022; Sat, 13 Oct 2018 23:52:58 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9DNqwQD098360; Sat, 13 Oct 2018 23:52:58 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9DNqtQu098344; Sat, 13 Oct 2018 23:52:55 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201810132352.w9DNqtQu098344@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sat, 13 Oct 2018 23:52:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339351 - in head/lib/csu: aarch64 amd64 arm common i386 mips powerpc powerpc64 riscv sparc64 X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in head/lib/csu: aarch64 amd64 arm common i386 mips powerpc powerpc64 riscv sparc64 X-SVN-Commit-Revision: 339351 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.27 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: Sat, 13 Oct 2018 23:52:59 -0000 Author: kib Date: Sat Oct 13 23:52:55 2018 New Revision: 339351 URL: https://svnweb.freebsd.org/changeset/base/339351 Log: Process irelocs for statically linked binaries from crt1 on x86. This makes statically linked binaries with ifuncs operational. Reported and tested by: mjg Reviewed by: emaste, markj Sponsored by: The FreeBSD Foundation Approved by: re (rgrimes) Differential revision: https://reviews.freebsd.org/D17363 Added: head/lib/csu/amd64/reloc.c (contents, props changed) head/lib/csu/i386/reloc.c (contents, props changed) Modified: head/lib/csu/aarch64/Makefile head/lib/csu/amd64/Makefile head/lib/csu/amd64/crt1.c head/lib/csu/arm/Makefile head/lib/csu/common/ignore_init.c head/lib/csu/i386/Makefile head/lib/csu/i386/crt1_c.c head/lib/csu/mips/Makefile head/lib/csu/powerpc/Makefile head/lib/csu/powerpc64/Makefile head/lib/csu/riscv/Makefile head/lib/csu/sparc64/Makefile Modified: head/lib/csu/aarch64/Makefile ============================================================================== --- head/lib/csu/aarch64/Makefile Sat Oct 13 21:26:07 2018 (r339350) +++ head/lib/csu/aarch64/Makefile Sat Oct 13 23:52:55 2018 (r339351) @@ -7,6 +7,7 @@ OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= Scrt1.o gcrt1.o CFLAGS+= -I${.CURDIR:H}/common \ -I${SRCTOP}/lib/libc/include +CFLAGS+= -DCRT_IRELOC_SUPPRESS FILES= ${OBJS} FILESMODE= ${LIBMODE} Modified: head/lib/csu/amd64/Makefile ============================================================================== --- head/lib/csu/amd64/Makefile Sat Oct 13 21:26:07 2018 (r339350) +++ head/lib/csu/amd64/Makefile Sat Oct 13 23:52:55 2018 (r339351) @@ -5,9 +5,9 @@ SRCS= crt1.c crti.S crtn.S OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= Scrt1.o gcrt1.o -CFLAGS+= -I${.CURDIR:H}/common \ +CFLAGS+= -I${.CURDIR} -I${.CURDIR:H}/common \ -I${SRCTOP}/lib/libc/include -CFLAGS+= -fno-omit-frame-pointer +CFLAGS+= -fno-omit-frame-pointer -DCRT_IRELOC_RELA FILES= ${OBJS} FILESMODE= ${LIBMODE} Modified: head/lib/csu/amd64/crt1.c ============================================================================== --- head/lib/csu/amd64/crt1.c Sat Oct 13 21:26:07 2018 (r339350) +++ head/lib/csu/amd64/crt1.c Sat Oct 13 23:52:55 2018 (r339351) @@ -59,10 +59,12 @@ _start(char **ap, void (*cleanup)(void)) env = ap + 2 + argc; handle_argv(argc, argv, env); - if (&_DYNAMIC != NULL) + if (&_DYNAMIC != NULL) { atexit(cleanup); - else + } else { + process_irelocs(); _init_tls(); + } #ifdef GCRT atexit(_mcleanup); Added: head/lib/csu/amd64/reloc.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/csu/amd64/reloc.c Sat Oct 13 23:52:55 2018 (r339351) @@ -0,0 +1,66 @@ +/*- + * Copyright (c) 2018 The FreeBSD Foundation + * + * This software was developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include + +static void +crt1_handle_rela(const Elf_Rela *r) +{ + Elf_Addr *ptr, *where, target; + u_int p[4]; + uint32_t cpu_feature, cpu_feature2; + uint32_t cpu_stdext_feature, cpu_stdext_feature2; + + do_cpuid(1, p); + cpu_feature = p[3]; + cpu_feature2 = p[2]; + do_cpuid(0, p); + if (p[0] >= 7) { + cpuid_count(7, 0, p); + cpu_stdext_feature = p[1]; + cpu_stdext_feature2 = p[2]; + } else { + cpu_stdext_feature = 0; + cpu_stdext_feature2 = 0; + } + + switch (ELF_R_TYPE(r->r_info)) { + case R_X86_64_IRELATIVE: + ptr = (Elf_Addr *)r->r_addend; + where = (Elf_Addr *)r->r_offset; + target = ((Elf_Addr (*)(uint32_t, uint32_t, uint32_t, + uint32_t))ptr)(cpu_feature, cpu_feature2, + cpu_stdext_feature, cpu_stdext_feature2); + *where = target; + break; + } +} Modified: head/lib/csu/arm/Makefile ============================================================================== --- head/lib/csu/arm/Makefile Sat Oct 13 21:26:07 2018 (r339350) +++ head/lib/csu/arm/Makefile Sat Oct 13 23:52:55 2018 (r339351) @@ -7,6 +7,7 @@ OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= Scrt1.o gcrt1.o CFLAGS+= -I${.CURDIR:H}/common \ -I${SRCTOP}/lib/libc/include +CFLAGS+= -DCRT_IRELOC_SUPPRESS STATIC_CFLAGS+= -mlong-calls FILES= ${OBJS} Modified: head/lib/csu/common/ignore_init.c ============================================================================== --- head/lib/csu/common/ignore_init.c Sat Oct 13 21:26:07 2018 (r339350) +++ head/lib/csu/common/ignore_init.c Sat Oct 13 23:52:55 2018 (r339351) @@ -2,8 +2,11 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright 2012 Konstantin Belousov - * All rights reserved. + * Copyright (c) 2018 The FreeBSD Foundation * + * Parts of this software was developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -29,7 +32,9 @@ __FBSDID("$FreeBSD$"); #include +#include #include + #include "notes.h" extern int main(int, char **, char **); @@ -45,6 +50,39 @@ extern void _init(void) __hidden; extern int _DYNAMIC; #pragma weak _DYNAMIC + +#if defined(CRT_IRELOC_RELA) +extern const Elf_Rela __rela_iplt_start[] __weak_symbol __hidden; +extern const Elf_Rela __rela_iplt_end[] __weak_symbol __hidden; + +#include "reloc.c" + +static void +process_irelocs(void) +{ + const Elf_Rela *r; + + for (r = &__rela_iplt_start[0]; r < &__rela_iplt_end[0]; r++) + crt1_handle_rela(r); +} +#elif defined(CRT_IRELOC_REL) +extern const Elf_Rel __rel_iplt_start[] __weak_symbol __hidden; +extern const Elf_Rel __rel_iplt_end[] __weak_symbol __hidden; + +#include "reloc.c" + +static void +process_irelocs(void) +{ + const Elf_Rel *r; + + for (r = &__rel_iplt_start[0]; r < &__rel_iplt_end[0]; r++) + crt1_handle_rel(r); +} +#elif defined(CRT_IRELOC_SUPPRESS) +#else +#error "Define platform reloc type" +#endif char **environ; const char *__progname = ""; Modified: head/lib/csu/i386/Makefile ============================================================================== --- head/lib/csu/i386/Makefile Sat Oct 13 21:26:07 2018 (r339350) +++ head/lib/csu/i386/Makefile Sat Oct 13 23:52:55 2018 (r339351) @@ -5,8 +5,9 @@ SRCS= crti.S crtn.S OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= gcrt1.o crt1.o Scrt1.o -CFLAGS+= -I${.CURDIR:H}/common \ +CFLAGS+= -I${.CURDIR} -I${.CURDIR:H}/common \ -I${SRCTOP}/lib/libc/include +CFLAGS+= -DCRT_IRELOC_REL FILES= ${OBJS} FILESMODE= ${LIBMODE} Modified: head/lib/csu/i386/crt1_c.c ============================================================================== --- head/lib/csu/i386/crt1_c.c Sat Oct 13 21:26:07 2018 (r339350) +++ head/lib/csu/i386/crt1_c.c Sat Oct 13 23:52:55 2018 (r339351) @@ -56,10 +56,12 @@ _start1(fptr cleanup, int argc, char *argv[]) env = argv + argc + 1; handle_argv(argc, argv, env); - if (&_DYNAMIC != NULL) + if (&_DYNAMIC != NULL) { atexit(cleanup); - else + } else { + process_irelocs(); _init_tls(); + } #ifdef GCRT atexit(_mcleanup); Added: head/lib/csu/i386/reloc.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/csu/i386/reloc.c Sat Oct 13 23:52:55 2018 (r339351) @@ -0,0 +1,88 @@ +/*- + * Copyright (c) 2018 The FreeBSD Foundation + * + * This software was developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include + +static void +crt1_handle_rel(const Elf_Rel *r) +{ + Elf_Addr *where, target; + u_int cpuid_supported, p[4]; + uint32_t cpu_feature, cpu_feature2; + uint32_t cpu_stdext_feature, cpu_stdext_feature2; + + __asm __volatile( + " pushfl\n" + " popl %%eax\n" + " movl %%eax,%%ecx\n" + " xorl $0x200000,%%eax\n" + " pushl %%eax\n" + " popfl\n" + " pushfl\n" + " popl %%eax\n" + " xorl %%eax,%%ecx\n" + " je 1f\n" + " movl $1,%0\n" + " jmp 2f\n" + "1: movl $0,%0\n" + "2:\n" + : "=r" (cpuid_supported) : : "eax", "ecx", "cc"); + if (cpuid_supported) { + do_cpuid(1, p); + cpu_feature = p[3]; + cpu_feature2 = p[2]; + do_cpuid(0, p); + if (p[0] >= 7) { + cpuid_count(7, 0, p); + cpu_stdext_feature = p[1]; + cpu_stdext_feature2 = p[2]; + } else { + cpu_stdext_feature = 0; + cpu_stdext_feature2 = 0; + } + } else { + cpu_feature = 0; + cpu_feature2 = 0; + cpu_stdext_feature = 0; + cpu_stdext_feature2 = 0; + } + + switch (ELF_R_TYPE(r->r_info)) { + case R_386_IRELATIVE: + where = (Elf_Addr *)r->r_offset; + target = ((Elf_Addr (*)(uint32_t, uint32_t, uint32_t, + uint32_t))*where)(cpu_feature, cpu_feature2, + cpu_stdext_feature, cpu_stdext_feature2); + *where = target; + break; + } +} Modified: head/lib/csu/mips/Makefile ============================================================================== --- head/lib/csu/mips/Makefile Sat Oct 13 21:26:07 2018 (r339350) +++ head/lib/csu/mips/Makefile Sat Oct 13 23:52:55 2018 (r339351) @@ -7,6 +7,7 @@ OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= Scrt1.o gcrt1.o CFLAGS+= -I${.CURDIR:H}/common \ -I${SRCTOP}/lib/libc/include +CFLAGS+= -DCRT_IRELOC_SUPPRESS FILES= ${OBJS} FILESMODE= ${LIBMODE} Modified: head/lib/csu/powerpc/Makefile ============================================================================== --- head/lib/csu/powerpc/Makefile Sat Oct 13 21:26:07 2018 (r339350) +++ head/lib/csu/powerpc/Makefile Sat Oct 13 23:52:55 2018 (r339351) @@ -7,6 +7,7 @@ OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= Scrt1.o gcrt1.o CFLAGS+= -I${.CURDIR:H}/common \ -I${SRCTOP}/lib/libc/include +CFLAGS+= -DCRT_IRELOC_SUPPRESS FILES= ${OBJS} FILESMODE= ${LIBMODE} Modified: head/lib/csu/powerpc64/Makefile ============================================================================== --- head/lib/csu/powerpc64/Makefile Sat Oct 13 21:26:07 2018 (r339350) +++ head/lib/csu/powerpc64/Makefile Sat Oct 13 23:52:55 2018 (r339351) @@ -7,7 +7,7 @@ OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= Scrt1.o gcrt1.o CFLAGS+= -I${.CURDIR:H}/common \ -I${SRCTOP}/lib/libc/include \ - -mlongcall + -mlongcall -DCRT_IRELOC_SUPPRESS FILES= ${OBJS} FILESMODE= ${LIBMODE} Modified: head/lib/csu/riscv/Makefile ============================================================================== --- head/lib/csu/riscv/Makefile Sat Oct 13 21:26:07 2018 (r339350) +++ head/lib/csu/riscv/Makefile Sat Oct 13 23:52:55 2018 (r339351) @@ -7,6 +7,7 @@ OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= Scrt1.o gcrt1.o CFLAGS+= -I${.CURDIR:H}/common \ -I${SRCTOP}/lib/libc/include +CFLAGS+= -DCRT_IRELOC_SUPPRESS FILES= ${OBJS} FILESMODE= ${LIBMODE} Modified: head/lib/csu/sparc64/Makefile ============================================================================== --- head/lib/csu/sparc64/Makefile Sat Oct 13 21:26:07 2018 (r339350) +++ head/lib/csu/sparc64/Makefile Sat Oct 13 23:52:55 2018 (r339351) @@ -7,6 +7,7 @@ OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= Scrt1.o gcrt1.o CFLAGS+= -I${.CURDIR:H}/common \ -I${SRCTOP}/lib/libc/include +CFLAGS+= -DCRT_IRELOC_SUPPRESS FILES= ${OBJS} FILESMODE= ${LIBMODE}