freebsd/freebsd-src
1
0 Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2026-11-07 04:36:52 -10:00
Code Issues Packages Projects Releases Wiki Activity

camcontrol: Fix -Wcast-align errors in the NVMe reservation report

Browse Source 
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:	ba75cf0572 ("camcontrol: Support NVMe reservations via the persist subcommand")
Co-authored-by:	Claude Fable 5 <[email protected]>
MFC after:	1 week
Sponsored by:	Spectra Logic
This commit is contained in:
Kenneth D. Merry committed 2026-11-06 22:33:25 -05:00
1 parent c17aa0984d
commit 68ba58a064
1 file changed
+11 -7
Download Patch File Download Diff File Expand all files Collapse all files
sbin/camcontrol/nvres.c
+11 -7
View File
@@ -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) -