From nobody Fri May 26 20:06:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QSbYC3fdbz4Crlg; Fri, 26 May 2023 20:06:55 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QSbYC0YbBz3Cd3; Fri, 26 May 2023 20:06:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685131615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KyiDIwVAkocD3Nv4bFJUlLs7L5Sr25rXgZljKyn2fvY=; b=CCFPSDM0PYtVtY8z+lQjQaqCI7xYGSmly4J3FmCX1boWRp8Mnf/LvgAx5MS98dnGyzKCxT lBDU1dKKtJaqB9CQv0G8pjzT0rwOyjNQ10AmFQthbcGZrV9nfa5w1K1xLrxkrPvWuryQpS ZD7FA5L0erZM9ACfYAoUm84GF37qt7igKLRuJUXPxZzlf10hURorpg+iTF5oFEJ/CWDsUe 2lMGMhaZ2+KP9U2q3gJznGaM9cWYwD9WOdQIeGzYkF0DLxORA3Vq2podQa6qttWuwfKhil TA9XpVd85VmBKrXw2AjH2Z5SvymVvT4KVWoP3KcZ60YPFuYqKLZbe7a/5bmlsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685131615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KyiDIwVAkocD3Nv4bFJUlLs7L5Sr25rXgZljKyn2fvY=; b=cu635OoBcRQcUq6XAZZKlB8zgYzmm+QHeJ+cXFJ9nLaNjGpxFFZlPtumigQSHOc/UNgiBh rJ++Q88GDjCmZbq5KTaDaJu/Xs2MOBFdwYRvv5Dkp92PX4YwUliJhMvi4PEaf2d3ScB+CV w5PBxgLHA6z0AFHFCaubVPfeU7ztVPPe+lxm/gxqGFN61ruef/O4mnWl7Qu1c3TF7O7f6c UWz9Olbf7vxRYOxbPPKelj9yKaw/MATHyHr9ooBZE8X8IZQyJfLRuib7XfTPR2X+mtzq7C tHv+81djY4DajAHb7jbTTNPCCfpTXbQqa7xfmLx+Jim9KMbtVKUiP2qFG7bb5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685131615; a=rsa-sha256; cv=none; b=xjbApyroi1ptDIZEd0E88Ty5431XySrffHZxwRfiJ2Fkko8djnhPsPFKBfvxHBerTbUoP5 Jf9YyIDi+Eiov8K9ouFNmDDVqD9yd1tQrsgCaUAbBlS/GafaR/4yLwDTXh1MVvkps9fJrh GvT0L/h353lhtlsUsMyc64kAUESqFFk3vpQUpWncwmx6JjD6Dwz2JKJUAyd70RWuKmiiuh fyL8FUhiB8IybF5ottmBKxRGsLCT/WJ3Z8vHvCixyoJYujlCM1g3JtzoPuArcep6aInn1O NwJ1Wx4NXJd0ltJAM5hLmfz5KXs1nYCBGWZgReLiAUpX6fjMzTbU8W/6Qk5RnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QSbYB6Gs7zKdm; Fri, 26 May 2023 20:06:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34QK6sKR098172; Fri, 26 May 2023 20:06:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34QK6sv1098171; Fri, 26 May 2023 20:06:54 GMT (envelope-from git) Date: Fri, 26 May 2023 20:06:54 GMT Message-Id: <202305262006.34QK6sv1098171@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 14c5cf3a16c9 - main - makefs/zfs: Avoid generating a GUID of zero List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14c5cf3a16c9c21b49e0ec0a109467d81e5a47ff Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=14c5cf3a16c9c21b49e0ec0a109467d81e5a47ff commit 14c5cf3a16c9c21b49e0ec0a109467d81e5a47ff Author: Mark Johnston AuthorDate: 2023-05-26 19:14:00 +0000 Commit: Mark Johnston CommitDate: 2023-05-26 19:38:08 +0000 makefs/zfs: Avoid generating a GUID of zero --- usr.sbin/makefs/zfs.c | 20 ++++++++++++++++++-- usr.sbin/makefs/zfs/dsl.c | 2 +- usr.sbin/makefs/zfs/zfs.h | 1 + 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/usr.sbin/makefs/zfs.c b/usr.sbin/makefs/zfs.c index 7c2805ae5bbb..4d45926fb33f 100644 --- a/usr.sbin/makefs/zfs.c +++ b/usr.sbin/makefs/zfs.c @@ -274,6 +274,22 @@ nvlist_copy(const nvlist_t *nvl, char *buf, size_t sz) memcpy(buf + sizeof(nvl->nv_header), nvl->nv_data, nvl->nv_size); } +/* + * Avoid returning a GUID of 0, just to avoid the possibility that something + * will interpret that as meaning that the GUID is uninitialized. + */ +uint64_t +randomguid(void) +{ + uint64_t ret; + + do { + ret = ((uint64_t)random() << 32) | random(); + } while (ret == 0); + + return (ret); +} + static nvlist_t * pool_config_nvcreate(zfs_opt_t *zfs) { @@ -529,8 +545,8 @@ pool_init(zfs_opt_t *zfs) { uint64_t dnid; - zfs->poolguid = ((uint64_t)random() << 32) | random(); - zfs->vdevguid = ((uint64_t)random() << 32) | random(); + zfs->poolguid = randomguid(); + zfs->vdevguid = randomguid(); zfs->mos = objset_alloc(zfs, DMU_OST_META); diff --git a/usr.sbin/makefs/zfs/dsl.c b/usr.sbin/makefs/zfs/dsl.c index f6b7dc0ede17..a9ab93a90c38 100644 --- a/usr.sbin/makefs/zfs/dsl.c +++ b/usr.sbin/makefs/zfs/dsl.c @@ -602,7 +602,7 @@ dsl_dataset_alloc(zfs_opt_t *zfs, zfs_dsl_dir_t *dir) ds->phys->ds_creation_txg = TXG - 1; if (ds != zfs->snapds) ds->phys->ds_prev_snap_txg = TXG - 1; - ds->phys->ds_guid = ((uint64_t)random() << 32) | random(); + ds->phys->ds_guid = randomguid(); ds->dir = dir; return (ds); diff --git a/usr.sbin/makefs/zfs/zfs.h b/usr.sbin/makefs/zfs/zfs.h index b585955f7a1d..193ca1248d89 100644 --- a/usr.sbin/makefs/zfs/zfs.h +++ b/usr.sbin/makefs/zfs/zfs.h @@ -168,5 +168,6 @@ struct dnode_cursor *dnode_cursor_init(zfs_opt_t *, zfs_objset_t *, dnode_phys_t *, off_t, off_t); blkptr_t *dnode_cursor_next(zfs_opt_t *, struct dnode_cursor *, off_t); void dnode_cursor_finish(zfs_opt_t *, struct dnode_cursor *); +uint64_t randomguid(void); #endif /* !_MAKEFS_ZFS_H_ */