From nobody Mon Nov 16 21:00:38 2026 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 4jT0d26KqHz70wbv for ; Mon, 16 Nov 2026 21:00:38 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jT0d23TnYz4CMn for ; Mon, 16 Nov 2026 21:00:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794862838; 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=Pp6diEoCmBdMZUx3gytocPche6rMAMt7o0qcRiPV4x8=; b=rxyGQg1S5j4HewCMiYSynxLnbu1jLlydBg/sRUSlUgFrOprbWDtNwVyyfbevlvxlkalkD7 IUhydtwLlARaDeDReON/b52oRMiMPUfPOSsVG8Ou6B+Neufk9lJyvtfOrtqqAP2oFomMc/ esEiLniS0CC8M/SDzxZsvxUHxXph8dI7jxsE86AeHTQ1ga5K6cGsZ6e9io8BIyKILlFfh1 arywswvFkGRswzrLbmfrCY1TWmTQNqL0BjzEFFwl0n0N2AZGM39vwMYI20rJsH4lhpPvdf dvS4F2ZhQ3bIfiRhi9bp8AqsAtZsCXZqI/xMYZeURaBc+qEZmUXb4sElHV20KA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794862838; b=X94VxuqpQbrvr8Ua+FnnHKfA4U45hex1LuDqD9u/bLHsis2qXqt+5kcNJhVczWXI43Uaky dztL3JKHYyIXxPf5iGRAvUPefNZNhzp3qpstEVdkdYoTVgcO1ffIkH74d44W4+ARGjzxLc ibe3m5PlMfOBkhvUHgxzXuWYwCAV/ANivheaUxHto9GtkoEix/jdbjOwf06O7DaQOi5AD/ YQARFYNZSk6TRDOWb7LS3JfBK9ZFqblO62dJtNW5llqVX2OVEfFG9KcrlNiGLnsOAnk11w KSfNTlAVVaibHzljQ5lCnMSFxHsUQFe8Bb607rxFAP80TJdaMIaGppNqbA14og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794862838; 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=Pp6diEoCmBdMZUx3gytocPche6rMAMt7o0qcRiPV4x8=; b=OT0ZZlUO6oReP1wAQIDBuFjKX5djR10Bs5kh1KfAKd5yzKp5sTUnW8wqyn1HJcqBF/mQw4 L8yNmlzSd3hM/cgFLf6dtUKS4npDdKAc6854yNNdSG9sBgVHRd/Ca5qOaG95uTYa5GgS74 JBL5tWoKBlkuHQHPlrDvAE0isuzqZejB7kbk+ZBLZ+LONjr++iaVDt53nxjm5ckZYXY9Jo Zw1mO7aXcOpjdb0iMABWdUqiyFPjWdn2xKQTiGm3jKNJtzc7HUSHMEbk210U6lAMSEESIn U9lL289f+ODAIXA9TkwEaDlSsxRUjbh75OsjgMkzN/CLMCXcKv0Y6PnS+NRW6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jT0d22BPgz1969 for ; Mon, 16 Nov 2026 21:00:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8545 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Nov 2026 21:00:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kenneth D. Merry Subject: git: 263ce2f425e8 - stable/15 - camcontrol: Fix -Wcast-align errors in the NVMe reservation report List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ken X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 263ce2f425e8a2cd0be49a7a7fefe407e9c6af35 Auto-Submitted: auto-generated Date: Mon, 16 Nov 2026 21:00:38 +0000 Message-Id: <6afb6ef6.8545.5db59303@gitrepo.freebsd.org> The branch stable/15 has been updated by ken: URL: https://cgit.FreeBSD.org/src/commit/?id=263ce2f425e8a2cd0be49a7a7fefe407e9c6af35 commit 263ce2f425e8a2cd0be49a7a7fefe407e9c6af35 Author: Kenneth D. Merry AuthorDate: 2026-11-07 03:33:21 +0000 Commit: Kenneth D. Merry CommitDate: 2026-11-16 16:12:31 +0000 camcontrol: Fix -Wcast-align errors in the NVMe reservation report Casting the byte buffer that holds the Reservation Report payload to the status structures trips -Wcast-align on strict-alignment architectures, which broke the CI builds there. Put the buffer in a union with the two status structures instead, so it is properly aligned and no casts are needed. Reported by: FreeBSD CI Fixes: ba75cf05727e ("camcontrol: Support NVMe reservations via the persist subcommand") Co-authored-by: Claude Fable 5 MFC after: 1 week Sponsored by: Spectra Logic (cherry picked from commit 68ba58a064d1004a031fac6f299f968dfc39241f) --- sbin/camcontrol/nvres.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/sbin/camcontrol/nvres.c b/sbin/camcontrol/nvres.c index dc36954f1fe9..ab6132d45fde 100644 --- a/sbin/camcontrol/nvres.c +++ b/sbin/camcontrol/nvres.c @@ -308,7 +308,11 @@ static int nvmeres_report(struct cam_device *device, int verbosemode, int err_recover, int eds, int retry_count, int timeout) { - uint8_t report_data[8192]; + union { + struct nvme_resv_status status; + struct nvme_resv_status_ext ext; + uint8_t bytes[8192]; + } report_data; union ccb *ccb = NULL; struct nvme_resv_status *rstatus; struct nvme_resv_status_ext *extstatus; @@ -326,14 +330,14 @@ nvmeres_report(struct cam_device *device, int verbosemode, int err_recover, } CCB_CLEAR_ALL_EXCEPT_HDR(&ccb->nvmeio); - bzero(report_data, sizeof(report_data)); + bzero(&report_data, sizeof(report_data)); nvme_resv_report(/*nvmeio*/ &ccb->nvmeio, /*retries*/ retry_count, /*cbfcnp*/ NULL, /*nsid*/ device->target_lun, /*report_type*/ eds, - /*data_ptr*/ report_data, + /*data_ptr*/ report_data.bytes, /*dxfer_len */ sizeof(report_data), /*timeout*/ timeout ? timeout : 30000); @@ -362,15 +366,15 @@ nvmeres_report(struct cam_device *device, int verbosemode, int err_recover, error = 1; goto bailout; } - rstatus = (struct nvme_resv_status *)report_data; + rstatus = &report_data.status; /* * XXX KDM evidently there is no concept of a residual in NVMe. */ if (eds == 0) nvme_resv_status_swapbytes(rstatus,sizeof(report_data)); else - nvme_resv_status_ext_swapbytes((struct nvme_resv_status_ext *) - report_data,sizeof(report_data)); + nvme_resv_status_ext_swapbytes(&report_data.ext, + sizeof(report_data)); num_ents = (rstatus->regctl[1] << 8) | rstatus->regctl[0]; printf("Generation: %u\n", rstatus->gen); @@ -391,7 +395,7 @@ nvmeres_report(struct cam_device *device, int verbosemode, int err_recover, * device reports more. */ if (eds == 1) { - extstatus = (struct nvme_resv_status_ext *)report_data; + extstatus = &report_data.ext; if (num_ents > (int)((sizeof(report_data) - sizeof(*extstatus)) / sizeof(extstatus->ctrlr[0]))) num_ents = (sizeof(report_data) -