From nobody Mon Nov 16 21:01:01 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 4jT0dT6gKcz70wS3 for ; Mon, 16 Nov 2026 21:01:01 +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 4jT0dT4lZ7z4CrW for ; Mon, 16 Nov 2026 21:01:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794862861; 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=VLsRAuICElH7+EBf0IEANsnj0TJkWjE1vXB1Z8IvNv0=; b=sNqNgHS0tiwEbDrGYaZMSawmb7ekby2L4zOPuVnooYpXZU/bZDYUyKUjPy00sMtrfCPTBw VyDkoVLCYSRng1/RL0rW2BRZuttxClsM8/sXAjNFe1jNfKdDwzTuYX29jvvv0LF72R2bdI cvQisD1DguA1lZHAzUxzNbmBDFBn7Og74hkmLULRBV8kUaVNGk5aZmgUD6+x33DizWKRzg G48pwh+daEl6s17xnjymbTffF1aSk2Xiu5burvo71SWg/4wRz009Of1GEHNgDF+zjdEYGq v9VAJO+1mM3EIpyB6rD16rztkemSPA/ccrQgxwTR84cgQSE9Q5S3e56yd4MyfA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794862861; b=VVr8pDIjvqdUq6d2f8tJee+FH02TOVfhPGxMNt+TwwV0++pvwM8OzkFFwQehNtd0AOS3+Z SkixQHKeqnKOFmSYwCApdMgHAPWxSGPbbIkogHGJ/8qbkznbn481h2RKcLAv3eyQD9SlpV fRHzNFq7ITGCbhFdJULOSu+m+WgVso9rLJCuUsgDVhhmuNWTh1AAxfM731KzvRQdbJ3WJP RSqUuH2gAxtUKSvXoawrp067zOOc1yuywkbb/25oayTWUyod82m7UfNnK5f95L1K0fUs02 3TLE1tvjgA+Zh32mKNqD4U9LOvYiQMry1+w0NBUTG2L1DMJSTFz0pyXuIMIiRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794862861; 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=VLsRAuICElH7+EBf0IEANsnj0TJkWjE1vXB1Z8IvNv0=; b=E4Yhuj0v+pvqzZ+IBCicbjL8Sq9YX2G3iT4rxwdgJ1D8NTBSEGMCq6TRBG1klKSHneN18a pK+7DjSPgX6/tXWJ7Yl/XemZdJ9Xkg+lE7jPRvNz8sPOrnljH7eiGar0xIeCGRPzIUnb8A XQhGLAQAh9HMUiC7Yqw9UvaPxqYglUSNb3mXU7zuYUp+Ri1IQ9WHeaSFMEv1PZ2gFUtLTB 1BgDteyDpJupmgyYGW+qFInQpWA1E5I91lDN4OxGwhd8DAKAg1H8foRDo/s6/xK6A6SZe5 ZORdTXoNWAFUVd079R/3X9bJsVyHK1VFH8Oj7OOVoFGPeXL77ODYdRvHWxQrwA== 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 4jT0dT3M8cz196P for ; Mon, 16 Nov 2026 21:01:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9cfc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Nov 2026 21:01:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kenneth D. Merry Subject: git: d4f728023276 - stable/14 - cam: Add NVMe reservation, format and features CCB building functions 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: d4f728023276465b96e56f15f9059ea6ef70b702 Auto-Submitted: auto-generated Date: Mon, 16 Nov 2026 21:01:01 +0000 Message-Id: <6afb6f0d.9cfc.e44b614@gitrepo.freebsd.org> The branch stable/14 has been updated by ken: URL: https://cgit.FreeBSD.org/src/commit/?id=d4f728023276465b96e56f15f9059ea6ef70b702 commit d4f728023276465b96e56f15f9059ea6ef70b702 Author: Kenneth D. Merry AuthorDate: 2026-11-07 01:05:54 +0000 Commit: Kenneth D. Merry CommitDate: 2026-11-16 21:00:05 +0000 cam: Add NVMe reservation, format and features CCB building functions Add NVMe CCB (union ccb / struct ccb_nvmeio) building functions for the four NVMe reservation opcodes, Format NVM, and Get Features / Set Features. These use the nvme_command building blocks added to sys/dev/nvme/nvme.h, and are used by the new camcontrol(8) nvres, nvformat and nvfeature subcommands that will be added separately. sys/cam/nvme/nvme_all.c: Add NVMe CCB building functions for the four NVMe reservation opcodes: nvme_resv_report(), nvme_resv_register(), nvme_resv_acquire() and nvme_resv_release(). Data direction is set internally (CAM_DIR_IN or CAM_DIR_OUT as appropriate), so no flags parameter is needed. Add a new nvme_format() CCB building function. Add nvme_get_feature() and nvme_set_feature() CCB building functions, along with nvme_get_feature_hostid() and nvme_set_feature_hostid() convenience wrappers for the hostid feature. nvme_set_feature_hostid() takes an sv argument so the caller can request that the hostid persist across reset. sys/cam/nvme/nvme_all.h: Add prototypes for the above. Wrap the declarations in __BEGIN_DECLS / __END_DECLS so C++ compilers don't mangle the names of the C symbols. Co-authored-by: Reid Linnemann Co-authored-by: Dave Baukus Co-authored-by: Claude Fable 5 Reviewed by: imp MFC after: 1 week Sponsored by: Spectra Logic Differential Revision: https://reviews.freebsd.org/D59532 (cherry picked from commit 9814633f631b41b8026a826b7731ec04c3d7d678) --- sys/cam/nvme/nvme_all.c | 201 ++++++++++++++++++++++++++++++++++++++++++++++++ sys/cam/nvme/nvme_all.h | 42 ++++++++++ 2 files changed, 243 insertions(+) diff --git a/sys/cam/nvme/nvme_all.c b/sys/cam/nvme/nvme_all.c index 1a740f71948e..10346a71b5ff 100644 --- a/sys/cam/nvme/nvme_all.c +++ b/sys/cam/nvme/nvme_all.c @@ -51,6 +51,7 @@ #include #include #include +#include #include #include @@ -200,6 +201,206 @@ nvme_command_sbuf(struct ccb_nvmeio *nvmeio, struct sbuf *sb) return(0); } +void +nvme_resv_report(struct ccb_nvmeio *nvmeio, uint32_t retries, + void (*cbfcnp)(struct cam_periph *, union ccb *), + uint32_t nsid, uint32_t report_type, uint8_t *data_ptr, + uint32_t dxfer_len, uint32_t timeout) +{ + cam_fill_nvmeio(/*nvmeio*/ nvmeio, + /*retries*/ retries, + /*cbfcnp*/ cbfcnp, + /*flags*/ CAM_DIR_IN, + /*data_ptr*/ data_ptr, + /*dxfer_len*/ dxfer_len, + /*timeout*/ timeout); + + nvme_ns_resv_report_cmd(/*cmd*/ &nvmeio->cmd, + /*nsid*/ nsid, + /*length*/ dxfer_len, + /*report_type*/ report_type); +} + +void +nvme_resv_register(struct ccb_nvmeio *nvmeio, uint32_t retries, + void (*cbfcnp)(struct cam_periph *, union ccb *), + uint32_t nsid, int cptpl, int iekey, int rrega, + uint8_t *data_ptr, uint32_t dxfer_len, uint32_t timeout) +{ + cam_fill_nvmeio(/*nvmeio*/ nvmeio, + /*retries*/ retries, + /*cbfcnp*/ cbfcnp, + /*flags*/ CAM_DIR_OUT, + /*data_ptr*/ data_ptr, + /*dxfer_len*/ dxfer_len, + /*timeout*/ timeout); + + nvme_ns_resv_register_cmd(/*cmd*/ &nvmeio->cmd, + /*nsid*/ nsid, + /*cptpl*/ cptpl, + /*iekey*/ iekey, + /*rrega*/ rrega); +} + +void +nvme_resv_acquire(struct ccb_nvmeio *nvmeio, uint32_t retries, + void (*cbfcnp)(struct cam_periph *, union ccb *), + uint32_t nsid, int rtype, int iekey, int racqa, + uint8_t *data_ptr, uint32_t dxfer_len, uint32_t timeout) +{ + cam_fill_nvmeio(/*nvmeio*/ nvmeio, + /*retries*/ retries, + /*cbfcnp*/ cbfcnp, + /*flags*/ CAM_DIR_OUT, + /*data_ptr*/ data_ptr, + /*dxfer_len*/ dxfer_len, + /*timeout*/ timeout); + + nvme_ns_resv_acquire_cmd(/*cmd*/ &nvmeio->cmd, + /*nsid*/ nsid, + /*rtype*/ rtype, + /*iekey*/ iekey, + /*racqa*/ racqa); +} + +void +nvme_resv_release(struct ccb_nvmeio *nvmeio, uint32_t retries, + void (*cbfcnp)(struct cam_periph *, union ccb *), + uint32_t nsid, int rtype, int iekey, int rrela, + uint8_t *data_ptr, uint32_t dxfer_len, uint32_t timeout) +{ + cam_fill_nvmeio(/*nvmeio*/ nvmeio, + /*retries*/ retries, + /*cbfcnp*/ cbfcnp, + /*flags*/ CAM_DIR_OUT, + /*data_ptr*/ data_ptr, + /*dxfer_len*/ dxfer_len, + /*timeout*/ timeout); + + nvme_ns_resv_release_cmd(/*cmd*/ &nvmeio->cmd, + /*nsid*/ nsid, + /*rtype*/ rtype, + /*iekey*/ iekey, + /*rrela*/ rrela); +} + +void +nvme_format(struct ccb_nvmeio *nvmeio, uint32_t retries, + void (*cbfcnp)(struct cam_periph *, union ccb *), + uint32_t nsid, int ses, int pil, int pi, int mset, int lbaf, + uint32_t timeout) +{ + cam_fill_nvmeadmin(/*nvmeio*/ nvmeio, + /*retries*/ retries, + /*cbfcnp*/ cbfcnp, + /*flags*/ CAM_DIR_NONE, + /*data_ptr*/ NULL, + /*dxfer_len*/ 0, + /*timeout*/ timeout); + + nvme_admin_format_cmd(/*cmd*/ &nvmeio->cmd, + /*nsid*/ nsid, + /*ses*/ ses, + /*pil*/ pil, + /*pi*/ pi, + /*mset*/ mset, + /*lbaf*/ lbaf); +} + +void +nvme_get_feature(struct ccb_nvmeio *nvmeio, uint32_t retries, + void (*cbfcnp)(struct cam_periph *, union ccb *), + uint32_t nsid, int sel, uint8_t feature, uint32_t cdw11, + int uuid_idx, uint8_t *data_ptr, uint32_t dxfer_len, + uint32_t timeout) +{ + cam_fill_nvmeadmin(/*nvmeio*/ nvmeio, + /*retries*/ retries, + /*cbfcnp*/ cbfcnp, + /*flags*/ CAM_DIR_IN, + /*data_ptr*/ data_ptr, + /*dxfer_len*/ dxfer_len, + /*timeout*/ timeout); + + nvme_admin_get_feature_cmd(/*cmd*/ &nvmeio->cmd, + /*nsid*/ nsid, + /*sel*/ sel, + /*feature*/ feature, + /*cdw11*/ cdw11, + /*uuid_idx*/ uuid_idx); +} + +void +nvme_set_feature(struct ccb_nvmeio *nvmeio, uint32_t retries, + void (*cbfcnp)(struct cam_periph *, union ccb *), + uint32_t nsid, int sv, uint8_t feature, uint32_t cdw11, + uint32_t cdw12, uint32_t cdw13, uint32_t cdw14, uint32_t cdw15, + uint8_t *data_ptr, uint32_t dxfer_len, uint32_t timeout) +{ + cam_fill_nvmeadmin(/*nvmeio*/ nvmeio, + /*retries*/ retries, + /*cbfcnp*/ cbfcnp, + /*flags*/ CAM_DIR_OUT, + /*data_ptr*/ data_ptr, + /*dxfer_len*/ dxfer_len, + /*timeout*/ timeout); + + nvme_admin_set_feature_cmd(/*cmd*/ &nvmeio->cmd, + /*nsid*/ nsid, + /*sv*/ sv, + /*feature*/ feature, + /*cdw11*/ cdw11, + /*cdw12*/ cdw12, + /*cdw13*/ cdw13, + /*cdw14*/ cdw14, + /*cdw15*/ cdw15); +} + +void +nvme_get_feature_hostid(struct ccb_nvmeio *nvmeio, uint32_t retries, + void (*cbfcnp)(struct cam_periph *, union ccb *), + int sel, int uuid_idx, uint8_t *data_ptr, + uint32_t dxfer_len, uint32_t timeout) +{ + nvme_get_feature(/*nvmeio*/ nvmeio, + /*retries*/ retries, + /*cbfcnp*/ cbfcnp, + /*nsid*/ 0, + /*sel*/ sel, + /*feature*/ NVME_FEAT_HOST_IDENTIFIER, + /*cdw11*/ 0, + /*uuid_idx*/ uuid_idx, + /*data_ptr*/ data_ptr, + /*dxfer_len*/ dxfer_len, + /*timeout*/ timeout); +} + +void +nvme_set_feature_hostid(struct ccb_nvmeio *nvmeio, uint32_t retries, + void (*cbfcnp)(struct cam_periph *, union ccb *), + int sv, int exhid, uint8_t *data_ptr, + uint32_t dxfer_len, uint32_t timeout) +{ + uint32_t cdw11 = 0; + if (exhid) + cdw11 = 0x01; + + nvme_set_feature(/*nvmeio*/ nvmeio, + /*retries*/ retries, + /*cbfcnp*/ cbfcnp, + /*nsid*/ 0, + /*sv*/ sv, + /*feature*/ NVME_FEAT_HOST_IDENTIFIER, + /*cdw11*/ cdw11, + /*cdw12*/ 0, + /*cdw13*/ 0, + /*cdw14*/ 0, + /*cdw15*/ 0, + /*data_ptr*/ data_ptr, + /*dxfer_len*/ dxfer_len, + /*timeout*/ timeout); +} + #ifdef _KERNEL const void * nvme_get_identify_cntrl(struct cam_periph *periph) diff --git a/sys/cam/nvme/nvme_all.h b/sys/cam/nvme/nvme_all.h index 2b6732fe7c74..ecfa167fb2d1 100644 --- a/sys/cam/nvme/nvme_all.h +++ b/sys/cam/nvme/nvme_all.h @@ -32,6 +32,7 @@ struct ccb_nvmeio; +__BEGIN_DECLS void nvme_ns_cmd(struct ccb_nvmeio *nvmeio, uint8_t cmd, uint32_t nsid, uint32_t cdw10, uint32_t cdw11, uint32_t cdw12, uint32_t cdw13, uint32_t cdw14, uint32_t cdw15); @@ -46,7 +47,48 @@ const char *nvme_op_string(const struct nvme_command *, int admin); const char *nvme_cmd_string(const struct nvme_command *, char *, size_t); void nvme_cmd_sbuf(const struct nvme_command *, struct sbuf *sb); int nvme_command_sbuf(struct ccb_nvmeio *nvmeio, struct sbuf *sb); +void nvme_resv_report(struct ccb_nvmeio *nvmeio, uint32_t retries, + void (*cbfcnp)(struct cam_periph *, union ccb *), + uint32_t nsid, uint32_t report_type, uint8_t *data_ptr, + uint32_t dxfer_len, uint32_t timeout); +void nvme_resv_register(struct ccb_nvmeio *nvmeio, uint32_t retries, + void (*cbfcnp)(struct cam_periph *, union ccb *), + uint32_t nsid, int cptpl, int iekey, int rrega, + uint8_t *data_ptr, uint32_t dxfer_len,uint32_t timeout); +void nvme_resv_acquire(struct ccb_nvmeio *nvmeio, uint32_t retries, + void (*cbfcnp)(struct cam_periph *, union ccb *), + uint32_t nsid, int rtype, int iekey, int racqa, + uint8_t *data_ptr, uint32_t dxfer_len, uint32_t timeout); +void nvme_resv_release(struct ccb_nvmeio *nvmeio, uint32_t retries, + void (*cbfcnp)(struct cam_periph *, union ccb *), + uint32_t nsid, int rtype, int iekey, int rrela, + uint8_t *data_ptr, uint32_t dxfer_len, uint32_t timeout); +void nvme_format(struct ccb_nvmeio *nvmeio, uint32_t retries, + void (*cbfcnp)(struct cam_periph *, union ccb *), + uint32_t nsid, int ses, int pil, int pi, int mset, int lbaf, + uint32_t timeout); +void nvme_get_feature(struct ccb_nvmeio *nvmeio, uint32_t retries, + void (*cbfcnp)(struct cam_periph *, union ccb *), + uint32_t nsid, int sel, uint8_t feature, uint32_t cdw11, + int uuid_idx, uint8_t *data_ptr, uint32_t dxfer_len, + uint32_t timeout); +void nvme_set_feature(struct ccb_nvmeio *nvmeio, uint32_t retries, + void (*cbfcnp)(struct cam_periph *, union ccb *), + uint32_t nsid, int sv, uint8_t feature, uint32_t cdw11, + uint32_t cdw12, uint32_t cdw13, uint32_t cdw14, + uint32_t cdw15, uint8_t *data_ptr, uint32_t dxfer_len, + uint32_t timeout); +void nvme_get_feature_hostid(struct ccb_nvmeio *nvmeio, uint32_t retries, + void (*cbfcnp)(struct cam_periph *, union ccb *), + int sel, int uuid_idx, uint8_t *data_ptr, + uint32_t dxfer_len, uint32_t timeout); +void nvme_set_feature_hostid(struct ccb_nvmeio *nvmeio, uint32_t retries, + void (*cbfcnp)(struct cam_periph *, union ccb *), + int sv, int exhid, uint8_t *data_ptr, + uint32_t dxfer_len, uint32_t timeout); +const char *nvme_command_string(struct ccb_nvmeio *nvmeio, char *, size_t); const void *nvme_get_identify_cntrl(struct cam_periph *); const void *nvme_get_identify_ns(struct cam_periph *); +__END_DECLS #endif /* CAM_NVME_NVME_ALL_H */