From nobody Tue May 07 20:54:19 2024 X-Original-To: dev-commits-src-main@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 4VYr9l4rD5z5JftQ; Tue, 07 May 2024 20:54:19 +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 4VYr9l2tVsz55BZ; Tue, 7 May 2024 20:54:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715115259; 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=CUOZJ8n9P60h/eIPoyh3jRpZ5nV80WRmNJx3HVUV8mA=; b=a6aHCXt07VNuCrGAMRGaYXDvhUqpnmcFUE4kfqlM9D8PfSMXaMwVcTBC5b878FHYgDqvb9 bjLB1WOt5bsBj4rUG8HY662Pe6lsPIwuZUEHVfsZH31HGeyGlwPs7YAFC5bN5oXlPPLEWG lSuoVoKHirwvYTIV+3NH00amjWQxifE0K9WDZNktymCe6szeFhNWl2y8ZFZuHsX4eA8iyS KcUIbwwQPzf3nw68AnB8otEp0P+6gaeiThzurPXBWqHlSEa091P9WY+l0nGs8dTPYzKjEM Gikm5y4eqI/N/2RLVvBKXHzTwzk4BKBrj8aBKQcUpnvo1rD+1o7qdfoS7Kp07Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715115259; a=rsa-sha256; cv=none; b=UYQ1DBUtPHvHQsMNirj/tDhysn0JBCnf/dl7CS/4SsvPykBMYCxN6kHVojTD8ePrZnzKDr zpm6g3kqM7vy1zM3RQrimtsgRgg85dpDrDw79xn++IO27G80vGLqiN1Lfk7GydkGOuAW2Z OrOwq+9OqwRqx2v5hErz3b2TC9lghjW6UyveBHsBkCz/51TRPE24pzOj+aYLAYJPXpwkJ7 xOMOpwEeK7te0amOiEcOjT1gxZIJpjoAwmwQPE8wkraJhuvpMxciV0Y/hQFEhoSpIQ0T8S aemqSczS8/YRLFjEHTCKyO3qATNX6SZJ4tanfKZEdAP8Aq0KnFlD4NrXJf2w0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715115259; 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=CUOZJ8n9P60h/eIPoyh3jRpZ5nV80WRmNJx3HVUV8mA=; b=cHzj9nfH3KhI5wvT458dy629RWxd0NalcuMjBi20xHxWhzMs+EVrqA93BURYFS78Vi52w9 PvrEqe421TqdMWPsDuvWbjzNXHH9OPmAd2JaFoWRJo2UEIJQtZz1VvR+3EwRcA2+7OMYPd fershMsqKG/s5WB+2SrqVevYl1hILuBJcIohg8LXM0iiBlXGyOHVOQsscM0RiJPOiKjZjP BfQQB6WlLi/4ugjHTicZzvpMRGNZN5hRa98Vw3q/3bJ3GApJ6MjVVoFe0vn4j+LJmauYQT tH9Jv7TCMzPqbkfuGyYL35pKVBX4FUw1WGYKHCr08LYZ+6yKfjOy2Xml/nhBqg== 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 4VYr9l2SmQzwsB; Tue, 7 May 2024 20:54:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 447KsJ7x039914; Tue, 7 May 2024 20:54:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 447KsJVK039911; Tue, 7 May 2024 20:54:19 GMT (envelope-from git) Date: Tue, 7 May 2024 20:54:19 GMT Message-Id: <202405072054.447KsJVK039911@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 29d7e39f5690 - main - nvme: Bump the alignment of struct nvme_health_information_page to 8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29d7e39f5690af095b96ce2d3c9907423c7f5715 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=29d7e39f5690af095b96ce2d3c9907423c7f5715 commit 29d7e39f5690af095b96ce2d3c9907423c7f5715 Author: John Baldwin AuthorDate: 2024-05-07 20:48:06 +0000 Commit: John Baldwin CommitDate: 2024-05-07 20:54:00 +0000 nvme: Bump the alignment of struct nvme_health_information_page to 8 This ensures that embedded uint64_t values used for statistics counters are aligned when allocating a structure on the stack or as part of a containing structure. In particular this quiets -Waddress-of-packed-member warnings from GCC when compiling the code in nvmfd to update the stats. Reported by: GCC --- sys/dev/nvme/nvme.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index a4baade7df5d..6ef7a2bd8aad 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -1601,7 +1601,7 @@ struct nvme_health_information_page { uint32_t ttftmt2; uint8_t reserved2[280]; -} __packed __aligned(4); +} __packed __aligned(8); _Static_assert(sizeof(struct nvme_health_information_page) == 512, "bad size for nvme_health_information_page");