From owner-svn-src-releng@freebsd.org Mon Dec 14 21:20:57 2020 Return-Path: Delivered-To: svn-src-releng@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 9B5694C39A4; Mon, 14 Dec 2020 21:20:57 +0000 (UTC) (envelope-from gordon@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 4CvvSn43Kxz3qd7; Mon, 14 Dec 2020 21:20:57 +0000 (UTC) (envelope-from gordon@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 7D6EF423; Mon, 14 Dec 2020 21:20:57 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BELKvIq024541; Mon, 14 Dec 2020 21:20:57 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BELKuTr024533; Mon, 14 Dec 2020 21:20:56 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202012142120.0BELKuTr024533@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Mon, 14 Dec 2020 21:20:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r368643 - in releng/11.4: . crypto/openssl/crypto/asn1 crypto/openssl/crypto/x509v3 sys/conf X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in releng/11.4: . crypto/openssl/crypto/asn1 crypto/openssl/crypto/x509v3 sys/conf X-SVN-Commit-Revision: 368643 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Dec 2020 21:20:57 -0000 Author: gordon Date: Mon Dec 14 21:20:55 2020 New Revision: 368643 URL: https://svnweb.freebsd.org/changeset/base/368643 Log: Fix OpenSSL NULL pointer de-reference. Approved by: so Security: FreeBSD-SA-20:33.openssl Security: CVE-2020-1971 Modified: releng/11.4/UPDATING releng/11.4/crypto/openssl/crypto/asn1/asn1.h releng/11.4/crypto/openssl/crypto/asn1/asn1_err.c releng/11.4/crypto/openssl/crypto/asn1/tasn_dec.c releng/11.4/crypto/openssl/crypto/asn1/tasn_enc.c releng/11.4/crypto/openssl/crypto/x509v3/v3_genn.c releng/11.4/sys/conf/newvers.sh Modified: releng/11.4/UPDATING ============================================================================== --- releng/11.4/UPDATING Mon Dec 14 20:48:59 2020 (r368642) +++ releng/11.4/UPDATING Mon Dec 14 21:20:55 2020 (r368643) @@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG and the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20201215: p6 FreeBSD-SA-20:33.openssl + + Fix OpenSSL NULL pointer de-reference. [SA-20:33.openssl] + 20201201: p5 FreeBSD-EN-20:19.audit FreeBSD-EN-20:20.tzdata FreeBSD-EN-20:22.callout Modified: releng/11.4/crypto/openssl/crypto/asn1/asn1.h ============================================================================== --- releng/11.4/crypto/openssl/crypto/asn1/asn1.h Mon Dec 14 20:48:59 2020 (r368642) +++ releng/11.4/crypto/openssl/crypto/asn1/asn1.h Mon Dec 14 21:20:55 2020 (r368643) @@ -1203,6 +1203,7 @@ void ERR_load_ASN1_strings(void); # define ASN1_F_ASN1_ITEM_DUP 191 # define ASN1_F_ASN1_ITEM_EX_COMBINE_NEW 121 # define ASN1_F_ASN1_ITEM_EX_D2I 120 +# define ASN1_F_ASN1_ITEM_EX_I2D 224 # define ASN1_F_ASN1_ITEM_I2D_BIO 192 # define ASN1_F_ASN1_ITEM_I2D_FP 193 # define ASN1_F_ASN1_ITEM_PACK 198 @@ -1304,6 +1305,7 @@ void ERR_load_ASN1_strings(void); # define ASN1_R_BAD_OBJECT_HEADER 102 # define ASN1_R_BAD_PASSWORD_READ 103 # define ASN1_R_BAD_TAG 104 +# define ASN1_R_BAD_TEMPLATE 221 # define ASN1_R_BMPSTRING_IS_WRONG_LENGTH 214 # define ASN1_R_BN_LIB 105 # define ASN1_R_BOOLEAN_IS_WRONG_LENGTH 106 Modified: releng/11.4/crypto/openssl/crypto/asn1/asn1_err.c ============================================================================== --- releng/11.4/crypto/openssl/crypto/asn1/asn1_err.c Mon Dec 14 20:48:59 2020 (r368642) +++ releng/11.4/crypto/openssl/crypto/asn1/asn1_err.c Mon Dec 14 21:20:55 2020 (r368643) @@ -1,6 +1,6 @@ /* crypto/asn1/asn1_err.c */ /* ==================================================================== - * Copyright (c) 1999-2018 The OpenSSL Project. All rights reserved. + * Copyright (c) 1999-2020 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -103,6 +103,7 @@ static ERR_STRING_DATA ASN1_str_functs[] = { {ERR_FUNC(ASN1_F_ASN1_ITEM_DUP), "ASN1_item_dup"}, {ERR_FUNC(ASN1_F_ASN1_ITEM_EX_COMBINE_NEW), "ASN1_ITEM_EX_COMBINE_NEW"}, {ERR_FUNC(ASN1_F_ASN1_ITEM_EX_D2I), "ASN1_ITEM_EX_D2I"}, + {ERR_FUNC(ASN1_F_ASN1_ITEM_EX_I2D), "ASN1_item_ex_i2d"}, {ERR_FUNC(ASN1_F_ASN1_ITEM_I2D_BIO), "ASN1_item_i2d_bio"}, {ERR_FUNC(ASN1_F_ASN1_ITEM_I2D_FP), "ASN1_item_i2d_fp"}, {ERR_FUNC(ASN1_F_ASN1_ITEM_PACK), "ASN1_item_pack"}, @@ -207,6 +208,7 @@ static ERR_STRING_DATA ASN1_str_reasons[] = { {ERR_REASON(ASN1_R_BAD_OBJECT_HEADER), "bad object header"}, {ERR_REASON(ASN1_R_BAD_PASSWORD_READ), "bad password read"}, {ERR_REASON(ASN1_R_BAD_TAG), "bad tag"}, + {ERR_REASON(ASN1_R_BAD_TEMPLATE), "bad template"}, {ERR_REASON(ASN1_R_BMPSTRING_IS_WRONG_LENGTH), "bmpstring is wrong length"}, {ERR_REASON(ASN1_R_BN_LIB), "bn lib"}, Modified: releng/11.4/crypto/openssl/crypto/asn1/tasn_dec.c ============================================================================== --- releng/11.4/crypto/openssl/crypto/asn1/tasn_dec.c Mon Dec 14 20:48:59 2020 (r368642) +++ releng/11.4/crypto/openssl/crypto/asn1/tasn_dec.c Mon Dec 14 21:20:55 2020 (r368643) @@ -223,6 +223,15 @@ static int asn1_item_ex_d2i(ASN1_VALUE **pval, const u break; case ASN1_ITYPE_MSTRING: + /* + * It never makes sense for multi-strings to have implicit tagging, so + * if tag != -1, then this looks like an error in the template. + */ + if (tag != -1) { + ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, ASN1_R_BAD_TEMPLATE); + goto err; + } + p = *in; /* Just read in tag and class */ ret = asn1_check_tlen(NULL, &otag, &oclass, NULL, NULL, @@ -240,6 +249,7 @@ static int asn1_item_ex_d2i(ASN1_VALUE **pval, const u ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, ASN1_R_MSTRING_NOT_UNIVERSAL); goto err; } + /* Check tag matches bit map */ if (!(ASN1_tag2bit(otag) & it->utype)) { /* If OPTIONAL, assume this is OK */ @@ -316,6 +326,15 @@ static int asn1_item_ex_d2i(ASN1_VALUE **pval, const u goto err; case ASN1_ITYPE_CHOICE: + /* + * It never makes sense for CHOICE types to have implicit tagging, so + * if tag != -1, then this looks like an error in the template. + */ + if (tag != -1) { + ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, ASN1_R_BAD_TEMPLATE); + goto err; + } + if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it, NULL)) goto auxerr; if (*pval) { Modified: releng/11.4/crypto/openssl/crypto/asn1/tasn_enc.c ============================================================================== --- releng/11.4/crypto/openssl/crypto/asn1/tasn_enc.c Mon Dec 14 20:48:59 2020 (r368642) +++ releng/11.4/crypto/openssl/crypto/asn1/tasn_enc.c Mon Dec 14 21:20:55 2020 (r368643) @@ -151,9 +151,25 @@ int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char break; case ASN1_ITYPE_MSTRING: + /* + * It never makes sense for multi-strings to have implicit tagging, so + * if tag != -1, then this looks like an error in the template. + */ + if (tag != -1) { + ASN1err(ASN1_F_ASN1_ITEM_EX_I2D, ASN1_R_BAD_TEMPLATE); + return -1; + } return asn1_i2d_ex_primitive(pval, out, it, -1, aclass); case ASN1_ITYPE_CHOICE: + /* + * It never makes sense for CHOICE types to have implicit tagging, so + * if tag != -1, then this looks like an error in the template. + */ + if (tag != -1) { + ASN1err(ASN1_F_ASN1_ITEM_EX_I2D, ASN1_R_BAD_TEMPLATE); + return -1; + } if (asn1_cb && !asn1_cb(ASN1_OP_I2D_PRE, pval, it, NULL)) return 0; i = asn1_get_choice_selector(pval, it); Modified: releng/11.4/crypto/openssl/crypto/x509v3/v3_genn.c ============================================================================== --- releng/11.4/crypto/openssl/crypto/x509v3/v3_genn.c Mon Dec 14 20:48:59 2020 (r368642) +++ releng/11.4/crypto/openssl/crypto/x509v3/v3_genn.c Mon Dec 14 21:20:55 2020 (r368643) @@ -72,8 +72,9 @@ ASN1_SEQUENCE(OTHERNAME) = { IMPLEMENT_ASN1_FUNCTIONS(OTHERNAME) ASN1_SEQUENCE(EDIPARTYNAME) = { - ASN1_IMP_OPT(EDIPARTYNAME, nameAssigner, DIRECTORYSTRING, 0), - ASN1_IMP_OPT(EDIPARTYNAME, partyName, DIRECTORYSTRING, 1) + /* DirectoryString is a CHOICE type so use explicit tagging */ + ASN1_EXP_OPT(EDIPARTYNAME, nameAssigner, DIRECTORYSTRING, 0), + ASN1_EXP(EDIPARTYNAME, partyName, DIRECTORYSTRING, 1) } ASN1_SEQUENCE_END(EDIPARTYNAME) IMPLEMENT_ASN1_FUNCTIONS(EDIPARTYNAME) @@ -107,6 +108,37 @@ GENERAL_NAME *GENERAL_NAME_dup(GENERAL_NAME *a) (char *)a); } +static int edipartyname_cmp(const EDIPARTYNAME *a, const EDIPARTYNAME *b) +{ + int res; + + if (a == NULL || b == NULL) { + /* + * Shouldn't be possible in a valid GENERAL_NAME, but we handle it + * anyway. OTHERNAME_cmp treats NULL != NULL so we do the same here + */ + return -1; + } + if (a->nameAssigner == NULL && b->nameAssigner != NULL) + return -1; + if (a->nameAssigner != NULL && b->nameAssigner == NULL) + return 1; + /* If we get here then both have nameAssigner set, or both unset */ + if (a->nameAssigner != NULL) { + res = ASN1_STRING_cmp(a->nameAssigner, b->nameAssigner); + if (res != 0) + return res; + } + /* + * partyName is required, so these should never be NULL. We treat it in + * the same way as the a == NULL || b == NULL case above + */ + if (a->partyName == NULL || b->partyName == NULL) + return -1; + + return ASN1_STRING_cmp(a->partyName, b->partyName); +} + /* Returns 0 if they are equal, != 0 otherwise. */ int GENERAL_NAME_cmp(GENERAL_NAME *a, GENERAL_NAME *b) { @@ -116,8 +148,11 @@ int GENERAL_NAME_cmp(GENERAL_NAME *a, GENERAL_NAME *b) return -1; switch (a->type) { case GEN_X400: + result = ASN1_TYPE_cmp(a->d.x400Address, b->d.x400Address); + break; + case GEN_EDIPARTY: - result = ASN1_TYPE_cmp(a->d.other, b->d.other); + result = edipartyname_cmp(a->d.ediPartyName, b->d.ediPartyName); break; case GEN_OTHERNAME: @@ -164,8 +199,11 @@ void GENERAL_NAME_set0_value(GENERAL_NAME *a, int type { switch (type) { case GEN_X400: + a->d.x400Address = value; + break; + case GEN_EDIPARTY: - a->d.other = value; + a->d.ediPartyName = value; break; case GEN_OTHERNAME: @@ -199,8 +237,10 @@ void *GENERAL_NAME_get0_value(GENERAL_NAME *a, int *pt *ptype = a->type; switch (a->type) { case GEN_X400: + return a->d.x400Address; + case GEN_EDIPARTY: - return a->d.other; + return a->d.ediPartyName; case GEN_OTHERNAME: return a->d.otherName; Modified: releng/11.4/sys/conf/newvers.sh ============================================================================== --- releng/11.4/sys/conf/newvers.sh Mon Dec 14 20:48:59 2020 (r368642) +++ releng/11.4/sys/conf/newvers.sh Mon Dec 14 21:20:55 2020 (r368643) @@ -44,7 +44,7 @@ TYPE="FreeBSD" REVISION="11.4" -BRANCH="RELEASE-p5" +BRANCH="RELEASE-p6" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From owner-svn-src-releng@freebsd.org Wed Dec 16 20:30:26 2020 Return-Path: Delivered-To: svn-src-releng@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 20F4B4C622D; Wed, 16 Dec 2020 20:30:26 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-oi1-f172.google.com (mail-oi1-f172.google.com [209.85.167.172]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cx6FX50jLz3sXj; Wed, 16 Dec 2020 20:30:24 +0000 (UTC) (envelope-from asomers@gmail.com) Received: by mail-oi1-f172.google.com with SMTP id q25so29202673oij.10; Wed, 16 Dec 2020 12:30:24 -0800 (PST) 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=LNhqUrPZLwEQ7YhUU/wXRMPq5fBO7P/CncsD5n5+Jfc=; b=Qec3/x6u9U/zopM4wjZ/NWiVU0LmRdCj3WYFvyH8iycmOxOoCQzdooqeYxQbFDexRV 1LQ5XLxvrXVz3QXrYF3TAmizJOLoP8Uy008mnVcXl6mwIcMzIsHNDsT9USuR/VtgXAdH Yzf0YuTGAyEpQ0gd2Kn4EP5qETpPeS85glCNZLQh9dJOJ90Iq9tUlBRnQgSmeO3W+98y jpaONwnhF+ZMJ1tPHDrYJzIBkJ9HxKo2o0+jEcUo7g4z0HTBAlgPkEBDoNPH4uFvPxRw mPWgdv2pGRKSAE+K9QEKtLbucuwaFdZ/gB0bg5oOEV3JYlMRqoTCL3brkdgMOFBQP+ok hR4w== X-Gm-Message-State: AOAM530Wbli9N9P66gBToV547N9+w1BKAJUn3iDF2Bui/V85JC/W+JBX eYPeuEkken0kTdK3mi2h7Zbk0qAPS0k7S6IWP1DHJeHg99A= X-Google-Smtp-Source: ABdhPJyoegBgl6OUzv1Rjja431r6fUddQzTFVWcdNrEJlZ7q5O7q93Uic5L7VyXLeszL//gxwyULCDIQCMRxY74yZU4= X-Received: by 2002:aca:af8f:: with SMTP id y137mr3035973oie.55.1608150623130; Wed, 16 Dec 2020 12:30:23 -0800 (PST) MIME-Version: 1.0 References: <202009192046.08JKkuBn080241@repo.freebsd.org> In-Reply-To: <202009192046.08JKkuBn080241@repo.freebsd.org> From: Alan Somers Date: Wed, 16 Dec 2020 13:30:12 -0700 Message-ID: Subject: Re: svn commit: r365917 - in releng/12.2: cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool sys/cddl/compat/opensolaris/kern sys/cddl/compat/opensolaris/sys sys/cddl/contrib/opensolar... To: Allan Jude Cc: src-committers , svn-src-all , svn-src-releng@freebsd.org X-Rspamd-Queue-Id: 4Cx6FX50jLz3sXj X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of asomers@gmail.com designates 209.85.167.172 as permitted sender) smtp.mailfrom=asomers@gmail.com X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FREEFALL_USER(0.00)[asomers]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; DMARC_NA(0.00)[freebsd.org]; SPAMHAUS_ZRD(0.00)[209.85.167.172:from:127.0.2.255]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.167.172:from]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCVD_IN_DNSWL_NONE(0.00)[209.85.167.172:from]; FORGED_SENDER(0.30)[asomers@freebsd.org,asomers@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.167.172:from]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FROM_NEQ_ENVFROM(0.00)[asomers@freebsd.org,asomers@gmail.com]; MAILMAN_DEST(0.00)[svn-src-all,svn-src-releng] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Dec 2020 20:30:26 -0000 On Sat, Sep 19, 2020 at 2:47 PM Allan Jude wrote: > Author: allanjude > Date: Sat Sep 19 20:46:56 2020 > New Revision: 365917 > URL: https://svnweb.freebsd.org/changeset/base/365917 > > Log: > MFS r365689,r365808,r365860 > > MFOpenZFS: Introduce read/write kstats per dataset > > The following patch introduces a few statistics on reads and writes > grouped by dataset. These statistics are implemented as kstats > (backed by aggregate sums for performance) and can be retrieved by > using the dataset objset ID number. The motivation for this change is > to provide some preliminary analytics on dataset usage/performance. > > Reviewed-by: Richard Elling > Reviewed-by: Brian Behlendorf > Reviewed by: Matthew Ahrens > Signed-off-by: Serapheim Dimitropoulos > > openzfs/zfs@a448a2557ec4938ed6944c7766fe0b8e6e5f6456 > > Also contains parts of: > MFOpenZFS: Connect dataset_kstats for FreeBSD > > Example output: > kstat.zfs.mypool.dataset.objset-0x10b.nread: 150528 > kstat.zfs.mypool.dataset.objset-0x10b.reads: 48 > kstat.zfs.mypool.dataset.objset-0x10b.nwritten: 134217728 > kstat.zfs.mypool.dataset.objset-0x10b.writes: 1024 > kstat.zfs.mypool.dataset.objset-0x10b.dataset_name: mypool/datasetname > > Reviewed-by: Ryan Moeller > Reviewed by: Sean Eric Fagan > Reviewed-by: Serapheim Dimitropoulos > Reviewed-by: Brian Behlendorf > Signed-off-by: Allan Jude > > openzfs/zfs@4547fc4e071ceb1818b3a46c3035b923e06e5390 > > Approved by: re (gjb) > Relnotes: yes > Sponsored by: Klara Inc. > This sounds quite useful! I've often wished that I could see per-dataset traffic statistics. Are there any user-friendly frontends to this? Like zfs-stats, or an updated zpool iostat? -Alan From owner-svn-src-releng@freebsd.org Thu Dec 17 09:00:11 2020 Return-Path: Delivered-To: svn-src-releng@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 9D62C4B118A; Thu, 17 Dec 2020 09:00:11 +0000 (UTC) (envelope-from se@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CxQtg3ltbz56TK; Thu, 17 Dec 2020 09:00:11 +0000 (UTC) (envelope-from se@freebsd.org) Received: from Stefans-MacBook-Pro-449.fritz.box (p200300cd5f184100b550dc137db23bdf.dip0.t-ipconnect.de [IPv6:2003:cd:5f18:4100:b550:dc13:7db2:3bdf]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: se/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id A3BFF21D00; Thu, 17 Dec 2020 09:00:10 +0000 (UTC) (envelope-from se@freebsd.org) To: Alan Somers , Allan Jude Cc: src-committers , svn-src-all , svn-src-releng@freebsd.org, Martin Matuska References: <202009192046.08JKkuBn080241@repo.freebsd.org> From: Stefan Esser Subject: Re: svn commit: r365917 - in releng/12.2: cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool sys/cddl/compat/opensolaris/kern sys/cddl/compat/opensolaris/sys sys/cddl/contrib/opensolar... Message-ID: Date: Thu, 17 Dec 2020 10:00:06 +0100 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.16; rv:78.0) Gecko/20100101 Thunderbird/78.5.1 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="zYqNcUXDyA35iXSOG6OoT3xxvBfhPLMG5" X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Dec 2020 09:00:11 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --zYqNcUXDyA35iXSOG6OoT3xxvBfhPLMG5 Content-Type: multipart/mixed; boundary="q8JIM182Z3jcfg2mi7cRZVErtB1d0EnBI"; protected-headers="v1" From: Stefan Esser To: Alan Somers , Allan Jude Cc: src-committers , svn-src-all , svn-src-releng@freebsd.org, Martin Matuska Message-ID: Subject: Re: svn commit: r365917 - in releng/12.2: cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool sys/cddl/compat/opensolaris/kern sys/cddl/compat/opensolaris/sys sys/cddl/contrib/opensolar... References: <202009192046.08JKkuBn080241@repo.freebsd.org> In-Reply-To: --q8JIM182Z3jcfg2mi7cRZVErtB1d0EnBI Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable Am 16.12.20 um 21:30 schrieb Alan Somers: > On Sat, Sep 19, 2020 at 2:47 PM Allan Jude > wrote: >=20 > Author: allanjude > Date: Sat Sep 19 20:46:56 2020 > New Revision: 365917 > URL: https://svnweb.freebsd.org/changeset/base/365917 > >=20 > Log: > =C2=A0 MFS r365689,r365808,r365860 >=20 > =C2=A0 MFOpenZFS: Introduce read/write kstats per dataset >=20 > =C2=A0 The following patch introduces a few statistics on reads an= d writes > =C2=A0 grouped by dataset. These statistics are implemented as kst= ats > =C2=A0 (backed by aggregate sums for performance) and can be retri= eved by > =C2=A0 using the dataset objset ID number. The motivation for this= change is > =C2=A0 to provide some preliminary analytics on dataset usage/perf= ormance. >=20 > =C2=A0 Reviewed-by: Richard Elling > =C2=A0 Reviewed-by: Brian Behlendorf > > =C2=A0 Reviewed by: Matthew Ahrens > > =C2=A0 Signed-off-by: Serapheim Dimitropoulos > >=20 > =C2=A0 openzfs/zfs@a448a2557ec4938ed6944c7766fe0b8e6e5f6456 >=20 > =C2=A0 Also contains parts of: > =C2=A0 MFOpenZFS: Connect dataset_kstats for FreeBSD >=20 > =C2=A0 Example output: > =C2=A0 kstat.zfs.mypool.dataset.objset-0x10b.nread: 150528 > =C2=A0 kstat.zfs.mypool.dataset.objset-0x10b.reads: 48 > =C2=A0 kstat.zfs.mypool.dataset.objset-0x10b.nwritten: 134217728 > =C2=A0 kstat.zfs.mypool.dataset.objset-0x10b.writes: 1024 > =C2=A0 kstat.zfs.mypool.dataset.objset-0x10b.dataset_name: > mypool/datasetname >=20 > =C2=A0 Reviewed-by: Ryan Moeller > =C2=A0 Reviewed by: Sean Eric Fagan > > =C2=A0 Reviewed-by: Serapheim Dimitropoulos > > =C2=A0 Reviewed-by: Brian Behlendorf > > =C2=A0 Signed-off-by: Allan Jude > >=20 > =C2=A0 openzfs/zfs@4547fc4e071ceb1818b3a46c3035b923e06e5390 >=20 > =C2=A0 Approved by:=C2=A0 re (gjb) > =C2=A0 Relnotes:=C2=A0 =C2=A0 =C2=A0yes > =C2=A0 Sponsored by: Klara Inc. >=20 >=20 > This sounds quite useful!=C2=A0 I've often wished that I could see=20 > per-dataset traffic statistics.=C2=A0 Are there any user-friendly front= ends=20 > to this?=C2=A0 Like zfs-stats, or an updated zpool iostat? I have updated zfs-stats for OpenZFS a few months ago and I'd be willing to add printing these new values to the port. The maintainer of the upstream version had little interest to accept my patches into his repository (after sending several request) and thus I have added a large patch to the port. If further changes are applied, I might fork the upstream repository and base the zfs-stats port on that fork (but I did not want to grab it without the current maintainer agreeing ...) Regards, STefan --q8JIM182Z3jcfg2mi7cRZVErtB1d0EnBI-- --zYqNcUXDyA35iXSOG6OoT3xxvBfhPLMG5 Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsB5BAABCAAjFiEEo3HqZZwL7MgrcVMTR+u171r99UQFAl/bHhYFAwAAAAAACgkQR+u171r99UQD +wgAhJwNnTA8JGBERdk5qU4cgGq0FUn+o2utm5kAbL/23SzkhJi00pCl+qirWzaxIpmEOZwUm9Xz cG/s/UvFYTJ9hboWWPBLf7df0I3ExNeyYIpqXKVfNfdDwNbBlXtz8VJFXRibkzLfI5Ax6+hk97Ll MoI3uLvZ2sLTUeOnb9/rByKXEbuoSCcm0kMc5HqPbyGQyBMfBsGvH3MjDnSLvGeT+45fJbG9Kezj RyBC8aKmrx8P4LHrFK1F5Idh7jKw86iZ5XFjWnmu3CyvVfGDWDboPQP6sIEHvFrVDcr0mGMCWf+k yFqHR8kPaNrX8SBcv4IqbFC2OR5eyOLck3GqDFfKAg== =NecG -----END PGP SIGNATURE----- --zYqNcUXDyA35iXSOG6OoT3xxvBfhPLMG5-- From owner-svn-src-releng@freebsd.org Thu Dec 17 09:33:15 2020 Return-Path: Delivered-To: svn-src-releng@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 C6AC64B1CF3 for ; Thu, 17 Dec 2020 09:33:15 +0000 (UTC) (envelope-from bounces+17430347-1240-svn-src-releng=freebsd.org@em4842.fdc-k.africa) Received: from pnkfpfkc.outbound-mail.sendgrid.net (pnkfpfkc.outbound-mail.sendgrid.net [50.31.63.28]) (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 4CxRcp43zMz58kd for ; Thu, 17 Dec 2020 09:33:14 +0000 (UTC) (envelope-from bounces+17430347-1240-svn-src-releng=freebsd.org@em4842.fdc-k.africa) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fdc-k.africa; h=content-transfer-encoding:content-type:from:mime-version:to:subject:list-unsubscribe; s=s1; bh=w3z6ban8VUkTmOooHA4mEUSPZlujk/EAAAaW+HaLYeE=; b=0EEy8jh 6ZF0FwvqIs0qMtK1fEpkn99E9pEdXo5crNXhrEpALmLCKM5kQIrOHnrRcfytfUIS lfEmg3VlXl5akx2ZneGuSVR7bFVpOO0NMzeHap3nLjop9fcHt1Yg1GXkI31ehTf/ zWQI+h17KuWYJEMQTkF+NNcwE0XIkQ+G+sHQ= Received: by filter2142p1las1.sendgrid.net with SMTP id filter2142p1las1-9889-5FDADFE6-1 2020-12-17 04:34:47.005234573 +0000 UTC m=+3168.656928624 Received: from MTc0MzAzNDc (unknown) by ismtpd0003p1sjc2.sendgrid.net (SG) with HTTP id OBygwgnbQg-qhyO6V0qP_w Thu, 17 Dec 2020 04:34:45.848 +0000 (UTC) Date: Thu, 17 Dec 2020 04:35:48 +0000 (UTC) From: "FDC Training" To: svn-src-releng@freebsd.org Message-ID: Subject: Invitation to GIS for Monitoring and Evaluation training JAN 2021 X-SG-EID: w/HQSfZibcjV/2ZTcwxQ4T2zUJi8p0iqq+DqM7JqTKxADyIsktM330xEIH6pHUjzPTB3rZHWJuAbcH Ko2qc58R5VXZsVpZ5REYiNsq6MvNfSGESXO9+goHwbscZ2GG9HlhG6c8CMiT8GEXBr5dMVz5l+O2w/ MDX+3kE/0Sp7lApbiRKoog/F3yoCh5Q1rLoDKEj1huJ4kXd4WuHSjedorXW8vGY/l103egkCbpwkRQ 4= X-Entity-ID: lgZohGoWIjvYsKzlUpYsxA== X-Rspamd-Queue-Id: 4CxRcp43zMz58kd X-Spamd-Bar: ++++ Authentication-Results: mx1.freebsd.org; dkim=pass header.d=fdc-k.africa header.s=s1 header.b=0EEy8jh ; dmarc=pass (policy=none) header.from=fdc-k.africa; spf=pass (mx1.freebsd.org: domain of bounces@em4842.fdc-k.africa designates 50.31.63.28 as permitted sender) smtp.mailfrom=bounces@em4842.fdc-k.africa X-Spamd-Result: default: False [4.11 / 15.00]; MV_CASE(0.50)[]; R_SPF_ALLOW(0.00)[+ip4:50.31.32.0/19]; TO_DN_NONE(0.00)[]; DKIM_TRACE(0.00)[fdc-k.africa:+]; DMARC_POLICY_ALLOW(0.00)[fdc-k.africa,none]; NEURAL_HAM_SHORT(-0.97)[-0.969]; FORGED_SENDER(0.30)[training@fdc-k.africa,bounces@em4842.fdc-k.africa]; RCVD_TLS_LAST(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[50.31.63.28:from]; ASN(0.00)[asn:11377, ipnet:50.31.48.0/20, country:US]; FROM_NEQ_ENVFROM(0.00)[training@fdc-k.africa,bounces@em4842.fdc-k.africa]; TAGGED_FROM(0.00)[17430347-1240-svn-src-releng=freebsd.org]; MIME_TRACE(0.00)[0:~]; ARC_NA(0.00)[]; R_DKIM_ALLOW(0.00)[fdc-k.africa:s=s1]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; HAS_LIST_UNSUB(-0.01)[]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[50.31.63.28:from:127.0.2.255]; NEURAL_SPAM_MEDIUM(0.99)[0.990]; BAD_REP_POLICIES(0.10)[]; NEURAL_SPAM_LONG(1.00)[1.000]; MIME_HTML_ONLY(0.20)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[50.31.63.28:from]; RBL_SENDERSCORE(2.00)[50.31.63.28:from]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[svn-src-releng] MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Dec 2020 09:33:15 -0000 From owner-svn-src-releng@freebsd.org Thu Dec 17 11:11:16 2020 Return-Path: Delivered-To: svn-src-releng@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 7BA024B4317; Thu, 17 Dec 2020 11:11:16 +0000 (UTC) (envelope-from se@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CxTnw2vBXz3HHH; Thu, 17 Dec 2020 11:11:16 +0000 (UTC) (envelope-from se@freebsd.org) Received: from Stefans-MacBook-Pro-449.fritz.box (p200300cd5f184100b550dc137db23bdf.dip0.t-ipconnect.de [IPv6:2003:cd:5f18:4100:b550:dc13:7db2:3bdf]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: se/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 89567224AA; Thu, 17 Dec 2020 11:11:15 +0000 (UTC) (envelope-from se@freebsd.org) From: Stefan Esser To: Alan Somers , Allan Jude Cc: src-committers , svn-src-all , svn-src-releng@freebsd.org, Martin Matuska References: <202009192046.08JKkuBn080241@repo.freebsd.org> Subject: Re: svn commit: r365917 - in releng/12.2: cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool sys/cddl/compat/opensolaris/kern sys/cddl/compat/opensolaris/sys sys/cddl/contrib/opensolar... Message-ID: <6dd6e281-7ffe-53b0-bc15-69b16fb67571@freebsd.org> Date: Thu, 17 Dec 2020 12:11:14 +0100 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.16; rv:78.0) Gecko/20100101 Thunderbird/78.5.1 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="BctDqAvd8hInqSWnLsagr7sJiLrPYU9vK" X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Dec 2020 11:11:16 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --BctDqAvd8hInqSWnLsagr7sJiLrPYU9vK Content-Type: multipart/mixed; boundary="WnWCz0crMPcClByA9qjehRoK1wmWvuCnS"; protected-headers="v1" From: Stefan Esser To: Alan Somers , Allan Jude Cc: src-committers , svn-src-all , svn-src-releng@freebsd.org, Martin Matuska Message-ID: <6dd6e281-7ffe-53b0-bc15-69b16fb67571@freebsd.org> Subject: Re: svn commit: r365917 - in releng/12.2: cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool sys/cddl/compat/opensolaris/kern sys/cddl/compat/opensolaris/sys sys/cddl/contrib/opensolar... References: <202009192046.08JKkuBn080241@repo.freebsd.org> In-Reply-To: --WnWCz0crMPcClByA9qjehRoK1wmWvuCnS Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: de-DE Content-Transfer-Encoding: quoted-printable Am 17.12.20 um 10:00 schrieb Stefan Esser: > Am 16.12.20 um 21:30 schrieb Alan Somers: >> This sounds quite useful!=C2=A0 I've often wished that I could see=20 >> per-dataset traffic statistics.=C2=A0 Are there any user-friendly fron= tends=20 >> to this?=C2=A0 Like zfs-stats, or an updated zpool iostat? >=20 > I have updated zfs-stats for OpenZFS a few months ago and I'd be willin= g > to add printing these new values to the port. >=20 > The maintainer of the upstream version had little interest to accept my= > patches into his repository (after sending several request) and thus I > have added a large patch to the port. >=20 > If further changes are applied, I might fork the upstream repository > and base the zfs-stats port on that fork (but I did not want to grab it= > without the current maintainer agreeing ...) The zfst-stats port has been updated to include per dataset operations statistics (new version 1.3.0_2). I could imagine to add average operations rates (operations per second of uptime), but this new version displays just the totals, for now. Regards, STefan --WnWCz0crMPcClByA9qjehRoK1wmWvuCnS-- --BctDqAvd8hInqSWnLsagr7sJiLrPYU9vK Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsB5BAABCAAjFiEEo3HqZZwL7MgrcVMTR+u171r99UQFAl/bPNIFAwAAAAAACgkQR+u171r99UTX WAf/dMzB1//GtZ8eFs6Ylk/YGk0RIctAXPBvIXlVsjvq1CP+5/5lZiWnPDcSg51wZRueD5UB5WUW viltylztjwdn0L65LlBFT5Ueo50YwQNA7ub7Y1ljgED2vjK6UFntAFF5EduinDgI/pqUPHoNv5HC uTXvBVUPd/uvdOkvzeieXXHB33DDaCnOpGcuziCd0RxNTQ1PP9HLCdQ0DPdBHAhEqkdeOMxxnrG+ WI4L9aTH4brkAGn+HO5otDPDuoyX5HgtMo/XMoJaltwrGDMeCDDqxnVkShuWBKNe8yIdHC5ideX0 +B3n0ZvU4zRtq/3mwglws6n1xSjeir9aeZlRorHNIQ== =UhbK -----END PGP SIGNATURE----- --BctDqAvd8hInqSWnLsagr7sJiLrPYU9vK--