From owner-svn-src-stable@freebsd.org Fri Oct 9 22:42:05 2020 Return-Path: Delivered-To: svn-src-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9091742F2F7; Fri, 9 Oct 2020 22:42:05 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C7NNs38ZYz3WJg; Fri, 9 Oct 2020 22:42:05 +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 357BF20951; Fri, 9 Oct 2020 22:42:05 +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 099Mg4pA024810; Fri, 9 Oct 2020 22:42:04 GMT (envelope-from allanjude@FreeBSD.org) Received: (from allanjude@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 099Mg4Lg024808; Fri, 9 Oct 2020 22:42:04 GMT (envelope-from allanjude@FreeBSD.org) Message-Id: <202010092242.099Mg4Lg024808@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: allanjude set sender to allanjude@FreeBSD.org using -f From: Allan Jude Date: Fri, 9 Oct 2020 22:42:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r366590 - in stable/12: stand/libsa/zfs usr.bin/netstat X-SVN-Group: stable-12 X-SVN-Commit-Author: allanjude X-SVN-Commit-Paths: in stable/12: stand/libsa/zfs usr.bin/netstat X-SVN-Commit-Revision: 366590 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Oct 2020 22:42:05 -0000 Author: allanjude Date: Fri Oct 9 22:42:04 2020 New Revision: 366590 URL: https://svnweb.freebsd.org/changeset/base/366590 Log: MFC r364787: ZFS: whitelist zstd and encryption in the loader Please note that neither zstd nor encryption is supported by the loader at this instant. This change makes it safe to use those features in one's root pool, but not in one's root dataset. Modified: stable/12/stand/libsa/zfs/zfsimpl.c stable/12/usr.bin/netstat/route.c Directory Properties: stable/12/ (props changed) Modified: stable/12/stand/libsa/zfs/zfsimpl.c ============================================================================== --- stable/12/stand/libsa/zfs/zfsimpl.c Fri Oct 9 22:23:39 2020 (r366589) +++ stable/12/stand/libsa/zfs/zfsimpl.c Fri Oct 9 22:42:04 2020 (r366590) @@ -127,6 +127,8 @@ static const char *features_for_read[] = { "com.delphix:device_removal", "com.delphix:obsolete_counts", "com.intel:allocation_classes", + "org.freebsd:zstd_compress", + "com.datto:encryption", NULL }; Modified: stable/12/usr.bin/netstat/route.c ============================================================================== --- stable/12/usr.bin/netstat/route.c Fri Oct 9 22:23:39 2020 (r366589) +++ stable/12/usr.bin/netstat/route.c Fri Oct 9 22:42:04 2020 (r366590) @@ -772,12 +772,7 @@ rt_stats(void) xo_emit("{W:rtstat: symbol not in namelist}\n"); return; } - if ((rttaddr = nl[N_RTTRASH].n_value) == 0) { - xo_emit("{W:rttrash: symbol not in namelist}\n"); - return; - } kread(rtsaddr, (char *)&rtstat, sizeof (rtstat)); - kread(rttaddr, (char *)&rttrash, sizeof (rttrash)); xo_emit("{T:routing}:\n"); #define p(f, m) if (rtstat.f || sflag <= 1) \ @@ -793,7 +788,17 @@ rt_stats(void) "{N:/destination%s found unreachable}\n"); p(rts_wildcard, "\t{:wildcard-uses/%hu} " "{N:/use%s of a wildcard route}\n"); + p(rts_nh_idx_alloc_failure, "\t{:nexthop-index-alloc-failures/%hu} " + "{N:/nexthop index alloc failure%s}\n"); + p(rts_nh_alloc_failure, "\t{:nexthop-alloc-failures/%hu} " + "{N:/nexthop allocation failure%s}\n"); #undef p + + if ((rttaddr = nl[N_RTTRASH].n_value) == 0) { + xo_emit("{W:rttrash: symbol not in namelist}\n"); + return; + } + kread(rttaddr, (char *)&rttrash, sizeof (rttrash)); if (rttrash || sflag <= 1) xo_emit("\t{:unused-but-not-freed/%u} "