From nobody Tue Aug 16 15:03:13 2022 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 4M6ZCQ1QDHz4ZKh3; Tue, 16 Aug 2022 15:03:14 +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 4M6ZCQ0qrLz3M6D; Tue, 16 Aug 2022 15:03:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660662194; 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=5xt1Tk4IqpTz+j5oW8EFNBRha5ipt632/y4HUbbSCOs=; b=v8gYUeOpgKNvmBXBI9EfY44nkSruSDiQZ+2NYRnK9xuZpO+rhdlmsu8tRPqAUZ+ezO2J+8 m6ntjm5HkQb4ZyOnGsjuD4KOs80pNpgspAa58S0rbQwra948pGNuaYqW3ny7ndk+1Lxtgc K0x6yPjwgIM1nx5iH14ZAqSSCk0yKA/Owh7aPecsNCJlJ1yx9HS+VJ6pbWmZ6zrjhPOA5a QSyp8VeLAVM+skRezM9tQVjGmapJO1u1zYk0SkHkn4m3JJhPGTo4Pj94NFuhLAEd4b+Hk3 lD03jyFuHBpuL+xowxZ5jzVBusa4vV55QReSvV/8tsEeU/ms4droTWAth23hrw== 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 4M6ZCP70zmz1CxY; Tue, 16 Aug 2022 15:03:13 +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 27GF3DAi046677; Tue, 16 Aug 2022 15:03:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27GF3DsC046676; Tue, 16 Aug 2022 15:03:13 GMT (envelope-from git) Date: Tue, 16 Aug 2022 15:03:13 GMT Message-Id: <202208161503.27GF3DsC046676@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: 187084dddd3e - main - makefs: Align the block buffer used in ZFS mode 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: 187084dddd3ebbd5853d6abd72aa1ab51b74d826 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660662194; 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=5xt1Tk4IqpTz+j5oW8EFNBRha5ipt632/y4HUbbSCOs=; b=OISPnyIl0C9yXF7Ur1TLU/rjLzKawzoTf14qwLf6FPfu3XqpNAIIRLdEMcaXSsNadMoCj2 Nti/xmKyO/VP9oBPsnl49crtgXFctbfM8xnDawPNIK4uxmRxqXbuj5ZbOFtdOHrpzghve9 6trEU7DBEHpqA/JC6oI0hbvNPLu7etDdbWj9qhI8h+TNNUTz/pEI/d4WKLxbJTaQdwbLMV T0wks6/Ijck93zvA0d5+WMusd5kUJuVdzU13zd8l4+sq68N+7e0Muu35CkPGBmIdkH2boV 81VswnjS+wxE5fM+kP6E789qmG/DIQXMFMsMupBKy9+dvmmYuF+a7ssMtVOayQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660662194; a=rsa-sha256; cv=none; b=wG5Au04cbkPu6OE5S4HzYyvgdd7xprRcYjv7B8jpXVTSv8GP6RTqQl8CdGR2PcS3wWN1cO Vbheh3qY154fyl+XhXqoPW6OtFD5En7ry6PTt1pSHSxeKziOQYi6e7Bt9Xo+mdBVe3l4oH jBhtgPkHE9yhJMbMT4Wfus8d6ZSPJhbUjrpUX3CNMIBHUcwl1fjhgVCTRCxDHWKVCXee/l noxgd/yyCQS+uU8CVSja9c05M4j7hJZY+/E2E4q6boFMlxaOsHzfmuJzPt9ZZNPCFLic5T umlVH757DhtRefAsjHL+Bf3UCG25Q8oE0SvsKreaTtn9lsNJ/SUFtJRb2kRXrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=187084dddd3ebbd5853d6abd72aa1ab51b74d826 commit 187084dddd3ebbd5853d6abd72aa1ab51b74d826 Author: Mark Johnston AuthorDate: 2022-08-16 14:02:09 +0000 Commit: Mark Johnston CommitDate: 2022-08-16 15:02:51 +0000 makefs: Align the block buffer used in ZFS mode For some dnode types, particularly ZAPs, we want the buffer to have uint64_t alignment. Sponsored by: The FreeBSD Foundation --- usr.sbin/makefs/zfs.c | 9 ++++++++- usr.sbin/makefs/zfs/zfs.h | 10 +++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/usr.sbin/makefs/zfs.c b/usr.sbin/makefs/zfs.c index 08689a558870..ab6011046b22 100644 --- a/usr.sbin/makefs/zfs.c +++ b/usr.sbin/makefs/zfs.c @@ -34,6 +34,7 @@ #include #include +#include #include #include #include @@ -69,7 +70,13 @@ struct dnode_cursor { void zfs_prep_opts(fsinfo_t *fsopts) { - zfs_opt_t *zfs = ecalloc(1, sizeof(*zfs)); + size_t align; + + align = alignof(uint64_t); + zfs_opt_t *zfs = aligned_alloc(align, roundup2(sizeof(*zfs), align)); + if (zfs == NULL) + err(1, "aligned_alloc"); + memset(zfs, 0, sizeof(*zfs)); const option_t zfs_options[] = { { '\0', "bootfs", &zfs->bootfs, OPT_STRPTR, diff --git a/usr.sbin/makefs/zfs/zfs.h b/usr.sbin/makefs/zfs/zfs.h index b92e2c035669..7ad3151dd8a2 100644 --- a/usr.sbin/makefs/zfs/zfs.h +++ b/usr.sbin/makefs/zfs/zfs.h @@ -35,6 +35,7 @@ #include #include +#include #include #include "makefs.h" @@ -65,10 +66,13 @@ struct dataset_desc { }; typedef struct { - bool nowarn; + /* + * Block buffer, needs to be aligned for various on-disk structures, + * ZAPs, etc.. + */ + char filebuf[MAXBLOCKSIZE] __aligned(alignof(uint64_t)); - /* I/O buffer, just for convenience. */ - char filebuf[MAXBLOCKSIZE]; + bool nowarn; /* Pool parameters. */ const char *poolname;