From nobody Mon Nov 16 21:01:17 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 4jT0dn4mV1z70whR for ; Mon, 16 Nov 2026 21:01:17 +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 4jT0dn2nSJz4DYy for ; Mon, 16 Nov 2026 21:01:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794862877; 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=0Czmqlmql/HR0iaKL8PuJ06h/ohKv+WhtonaIsBNRBQ=; b=ZxkaQU+cVWq13oMeFzlGP8Rg63lAJpJPVEKgKZr9x5h8Tk/Xw8JFEatJAXuBhMf5W30Wcp TOH3nzv7ORVdc2TDw6M2ZREfuSGpc/ZNbIMhiVYufDyQwKoulVjkZ2j2TqHHkna8guTLxq U7ZaEBlgSFRSVP+f8OBIE10xbdtS4YO9dT1JNt3+82F1/fWDgECYPnefjv9oeDapFW0rDL go9D5g3BJRtuubLgz+Bx7CJrhfufdjJtA50mJALKeRNUqiAh3JFLIX8MH98ZiDKwrGuhIB XB8+gncTjq+ypY4OELgN+aPfFSfgVbygoosRuFHiB5q5HHSKGqpJ6QtoWqhjaQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794862877; b=w51MtXLdvCXxS9m6jonpkomrkKiEJBHZJnJjy9l9WOZKKf8zFbTjlVoxjYGODKKbVNflyR okZ9I/LH06g/2cy4Gg+OKNAGcLbtrlp+uhTi1VSOmJHzAc/FluzamGEbx/Dj2GV8YMRNVy yVev8Gk57f7PYvxf1+OQgPzLmm0SHq4jDF+IwXl5fO6ArmxK593Ki2rm+tZHfQRjtrZUe9 BT5PjPPSv5H4k68E+mOyNpctkq2z6M/dq/dxJ4kt2ht+M4LnJinEd9AlPOV51UhYJXk51S /RD9Wh4lDy9FlevQ/B7jfxxR6gdqJTYIcK2t9Ixq5Ft+FZ4SmOV+EZC/0bKO4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794862877; 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=0Czmqlmql/HR0iaKL8PuJ06h/ohKv+WhtonaIsBNRBQ=; b=YhDvka77zuDkFwlQJfUTZVKYf42Tc4o2Xj+MW/3zwzG3rQ7PsKGVE+zUfj0mfJAak5n6ZE /ejbv70Nj05ic9b47Czf7479SReLZiFsVVH+f22GsS4GvYFmY7+J6scliuCVLIjJBCzYtk Ehp2i1qSwVOCxns0bBrvdWAp9T7rgCb9AZvUF5Lqbamr3wPafs2dItyH4TvsyEgpy9L6ei 7CENHvQ7o+SSycfGeF0VtRy/CNcT0aX2Z6Hbmdob0rRSV3wKNNVW2PSJGwnwNrmYzFllXZ CaFevazEt5N+lgQxb26SQ7AzBwyvVo/aQI5dnaL4oU2FeJ9fgrtXFt98neFpwA== 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 4jT0dn1tBQz193N for ; Mon, 16 Nov 2026 21:01:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8f98 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Nov 2026 21:01:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kenneth D. Merry Subject: git: f64d611af8ee - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: f64d611af8eee373dad980e28582f39ed698fdfd Auto-Submitted: auto-generated Date: Mon, 16 Nov 2026 21:01:17 +0000 Message-Id: <6afb6f1d.8f98.4deca555@gitrepo.freebsd.org> The branch stable/14 has been updated by ken: URL: https://cgit.FreeBSD.org/src/commit/?id=f64d611af8eee373dad980e28582f39ed698fdfd commit f64d611af8eee373dad980e28582f39ed698fdfd Author: Kenneth D. Merry AuthorDate: 2026-11-07 03:33:21 +0000 Commit: Kenneth D. Merry CommitDate: 2026-11-16 21:00:07 +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 ab9ac5b30607..1145278356c3 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) -