Page MenuHomeFreeBSD
Differential D44706

nvmf.h: New header defining ioctls for NVMe over Fabrics
ClosedPublic
Actions

Authored by jhb on Apr 9 2024, 11:03 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Mar 8, 6:27 AM
Unknown Object (File)
Sat, Mar 1, 10:15 PM
Unknown Object (File)
Thu, Feb 27, 10:08 AM
Unknown Object (File)
Thu, Feb 27, 5:25 AM
Unknown Object (File)
Thu, Feb 27, 3:02 AM
Unknown Object (File)
Wed, Feb 26, 11:01 PM
Unknown Object (File)
Wed, Feb 26, 6:35 PM
Unknown Object (File)
Wed, Feb 26, 9:39 AM
View All 100 Files
Subscribers
dab

Details

Reviewers
imp
Commits
rGd86edc181ab2: nvmf.h: New header defining ioctls for NVMe over Fabrics
Summary

This defines structures, ioctl commands, and related constants used
for both the Fabrics host and controller.

Sponsored by: Chelsio Communications

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 57510
Build 54398: arc lint + arc unit

Event Timeline

jhb created this revision.Apr 9 2024, 11:03 PM
Herald added a subscriber: dab. · View Herald TranscriptApr 9 2024, 11:03 PM
jhb requested review of this revision.Apr 9 2024, 11:03 PM
Harbormaster completed remote builds in B56997: Diff 136802.Apr 9 2024, 11:03 PM
jhb added a parent revision: D44705: nvmf_proto.h: Add additional types and constants from the 1.1 spec.Apr 9 2024, 11:03 PM
jhb added a child revision: D44707: nvmf: Install nvmf.h and nvmf_proto.h in /usr/include/dev/nvmf.
imp accepted this revision.Apr 13 2024, 5:53 PM

One nit... also applies to all of this series of reviews: consider omitting the license boilerplate.

sys/dev/nvme/nvme.h
47

won't line numbers go stale quickly?

This revision is now accepted and ready to land.Apr 13 2024, 5:53 PM
jhb added a comment.Apr 16 2024, 5:53 PM
In D44706#1020670, @imp wrote:

One nit... also applies to all of this series of reviews: consider omitting the license boilerplate.

Hmm, are we ready to do that? I know we have some SPDX-only files in the tree and are kind of allowing it, but I wasn't sure we'd crossed the point to preferring that by default.

sys/dev/nvme/nvme.h
47

Not the line number, the constant 200 as the second argument to _IO*

imp added a comment.Apr 18 2024, 4:24 AM
In D44706#1021491, @jhb wrote:
In D44706#1020670, @imp wrote:

One nit... also applies to all of this series of reviews: consider omitting the license boilerplate.

Hmm, are we ready to do that? I know we have some SPDX-only files in the tree and are kind of allowing it, but I wasn't sure we'd crossed the point to preferring that by default.

hence my suggesting that you consider it: it's an option....

sys/dev/nvme/nvme.h
47

Oh! That's a note for reserved future use...

jhb updated this revision to Diff 137976.May 1 2024, 8:58 PM

Add NVMF_DISCONNECT_HOST and NVMF_DISCONNECT_ALL ioctls for /dev/nvmf

This revision now requires review to proceed.May 1 2024, 8:58 PM
Harbormaster completed remote builds in B57510: Diff 137976.May 1 2024, 8:59 PM
jhb updated this revision to Diff 137980.May 1 2024, 9:11 PM

Add NVMF_DISCONNECT_HOST and NVMF_DISCONNECT_ALL ioctls for /dev/nvmf

Harbormaster completed remote builds in B57514: Diff 137980.May 1 2024, 9:11 PM
jhb updated this revision to Diff 137990.May 1 2024, 10:51 PM

Switch to SPDX-only license blocks for C files

Harbormaster completed remote builds in B57524: Diff 137990.May 1 2024, 10:51 PM
jhb added a comment.May 1 2024, 10:53 PM

Do we want to omit license blocks in manpages as well as C source? I've left them in the manpages for now.

This revision was not accepted when it landed; it landed in state Needs Review.May 3 2024, 12:16 AM
Closed by commit rGd86edc181ab2: nvmf.h: New header defining ioctls for NVMe over Fabrics (authored by jhb). · Explain Why
This revision was automatically updated to reflect the committed changes.
jhb added a commit: rGd86edc181ab2: nvmf.h: New header defining ioctls for NVMe over Fabrics.

Revision Contents
Changeset List

PathSize
sys/
dev/
nvme/
2 lines
nvmf/
100 lines

Diff 137976

View Options

sys/dev/nvme/nvme.h

Show First 20 Lines • Show All 80 Lines • ▼ Show 20 Lines
static __inline uint64_t * \ static __inline uint64_t * \
name##_PCTRIE_PTR2VAL(struct type *ptr) \ name##_PCTRIE_PTR2VAL(struct type *ptr) \
{ \ { \
\ \
return &ptr->field; \ return &ptr->field; \
} \ } \
\ \
static __inline __unused int \ static __inline __unused int \
name##_PCTRIE_INSERT(struct pctrie *ptree, struct type *ptr) \ name##_PCTRIE_INSERT_BASE(struct pctrie *ptree, void *parentp, \
uint64_t *val, uint64_t *found, struct type **found_out) \
{ \ { \
struct pctrie_node *parent; \ struct pctrie_node *parent; \
void *parentp; \
uint64_t *val = name##_PCTRIE_PTR2VAL(ptr); \
\ \
parentp = pctrie_insert_lookup_strict(ptree, val); \ if (__predict_false(found != NULL)) { \
if (parentp == NULL) \ *found_out = name##_PCTRIE_VAL2PTR(found); \
return (0); \ return (EEXIST); \
} \
if (parentp != NULL) { \
parent = allocfn(ptree); \ parent = allocfn(ptree); \
if (__predict_false(parent == NULL)) \ if (__predict_false(parent == NULL)) { \
if (found_out != NULL) \
*found_out = NULL; \
return (ENOMEM); \ return (ENOMEM); \
} \
pctrie_insert_node(parentp, parent, val); \ pctrie_insert_node(parentp, parent, val); \
} \
return (0); \ return (0); \
} \ } \
\ \
static __inline __unused int \ static __inline __unused int \
name##_PCTRIE_INSERT(struct pctrie *ptree, struct type *ptr) \
{ \
void *parentp; \
uint64_t *val = name##_PCTRIE_PTR2VAL(ptr); \
\
parentp = pctrie_insert_lookup_strict(ptree, val); \
return (name##_PCTRIE_INSERT_BASE(ptree, parentp, val, \
NULL, NULL)); \
} \
\
static __inline __unused int \
name##_PCTRIE_FIND_OR_INSERT(struct pctrie *ptree, struct type *ptr, \ name##_PCTRIE_FIND_OR_INSERT(struct pctrie *ptree, struct type *ptr, \
struct type **found_out_opt) \ struct type **found_out_opt) \
{ \ { \
struct pctrie_node *parent; \
void *parentp; \ void *parentp; \
uint64_t *val = name##_PCTRIE_PTR2VAL(ptr); \ uint64_t *val = name##_PCTRIE_PTR2VAL(ptr); \
uint64_t *found; \ uint64_t *found; \
\ \
parentp = pctrie_insert_lookup(ptree, val, &found); \ parentp = pctrie_insert_lookup(ptree, val, &found); \
if (found != NULL) { \ return (name##_PCTRIE_INSERT_BASE(ptree, parentp, val, \
if (found_out_opt != NULL) \ found, found_out_opt)); \
*found_out_opt = name##_PCTRIE_VAL2PTR(found); \
return (EEXIST); \
} \ } \
if (parentp == NULL) \
return (0); \
parent = allocfn(ptree); \
if (__predict_false(parent == NULL)) \
return (ENOMEM); \
pctrie_insert_node(parentp, parent, val); \
return (0); \
} \
\ \
static __inline __unused int \ static __inline __unused int \
name##_PCTRIE_INSERT_LOOKUP_GE(struct pctrie *ptree, struct type *ptr, \ name##_PCTRIE_INSERT_LOOKUP_GE(struct pctrie *ptree, struct type *ptr, \
struct type **found_out) \ struct type **found_out) \
{ \ { \
struct pctrie_node *parent, *neighbor; \ struct pctrie_node *neighbor; \
void *parentp; \ void *parentp; \
uint64_t *val = name##_PCTRIE_PTR2VAL(ptr); \ uint64_t *val = name##_PCTRIE_PTR2VAL(ptr); \
uint64_t *found; \ uint64_t *found; \
int retval; \
\ \
parentp = pctrie_insert_lookup_gt(ptree, val, &found, \ parentp = pctrie_insert_lookup_gt(ptree, val, &found, \
&neighbor); \ &neighbor); \
if (__predict_false(found != NULL)) { \ retval = name##_PCTRIE_INSERT_BASE(ptree, parentp, val, \
*found_out = name##_PCTRIE_VAL2PTR(found); \ found, found_out); \
return (EEXIST); \ if (retval != 0) \
} \ return (retval); \
if (parentp != NULL) { \
parent = allocfn(ptree); \
if (__predict_false(parent == NULL)) { \
*found_out = NULL; \
return (ENOMEM); \
} \
pctrie_insert_node(parentp, parent, val); \
} \
found = pctrie_subtree_lookup_gt(neighbor, *val); \ found = pctrie_subtree_lookup_gt(neighbor, *val); \
*found_out = name##_PCTRIE_VAL2PTR(found); \ *found_out = name##_PCTRIE_VAL2PTR(found); \
pctrie_subtree_lookup_gt_assert(neighbor, *val, ptree, found); \ pctrie_subtree_lookup_gt_assert(neighbor, *val, ptree, found); \
return (0); \ return (0); \
} \ } \
\ \
static __inline __unused int \ static __inline __unused int \
name##_PCTRIE_INSERT_LOOKUP_LE(struct pctrie *ptree, struct type *ptr, \ name##_PCTRIE_INSERT_LOOKUP_LE(struct pctrie *ptree, struct type *ptr, \
struct type **found_out) \ struct type **found_out) \
{ \ { \
struct pctrie_node *parent, *neighbor; \ struct pctrie_node *neighbor; \
void *parentp; \ void *parentp; \
uint64_t *val = name##_PCTRIE_PTR2VAL(ptr); \ uint64_t *val = name##_PCTRIE_PTR2VAL(ptr); \
uint64_t *found; \ uint64_t *found; \
int retval; \
\ \
parentp = pctrie_insert_lookup_lt(ptree, val, &found, \ parentp = pctrie_insert_lookup_lt(ptree, val, &found, \
&neighbor); \ &neighbor); \
if (__predict_false(found != NULL)) { \ retval = name##_PCTRIE_INSERT_BASE(ptree, parentp, val, \
*found_out = name##_PCTRIE_VAL2PTR(found); \ found, found_out); \
return (EEXIST); \ if (retval != 0) \
} \ return (retval); \
if (parentp != NULL) { \
parent = allocfn(ptree); \
if (__predict_false(parent == NULL)) { \
*found_out = NULL; \
return (ENOMEM); \
} \
pctrie_insert_node(parentp, parent, val); \
} \
found = pctrie_subtree_lookup_lt(neighbor, *val); \ found = pctrie_subtree_lookup_lt(neighbor, *val); \
*found_out = name##_PCTRIE_VAL2PTR(found); \ *found_out = name##_PCTRIE_VAL2PTR(found); \
pctrie_subtree_lookup_lt_assert(neighbor, *val, ptree, found); \ pctrie_subtree_lookup_lt_assert(neighbor, *val, ptree, found); \
return (0); \ return (0); \
} \ } \
\ \
static __inline __unused struct type * \ static __inline __unused struct type * \
name##_PCTRIE_LOOKUP(struct pctrie *ptree, uint64_t key) \ name##_PCTRIE_LOOKUP(struct pctrie *ptree, uint64_t key) \
▲ Show 20 Lines • Show All 297 Lines • Show Last 20 Lines
View Options

sys/dev/nvmf/nvmf.h

Show First 20 Lines • Show All 80 Lines • ▼ Show 20 Lines
static __inline uint64_t * \ static __inline uint64_t * \
name##_PCTRIE_PTR2VAL(struct type *ptr) \ name##_PCTRIE_PTR2VAL(struct type *ptr) \
{ \ { \
\ \
return &ptr->field; \ return &ptr->field; \
} \ } \
\ \
static __inline __unused int \ static __inline __unused int \
name##_PCTRIE_INSERT(struct pctrie *ptree, struct type *ptr) \ name##_PCTRIE_INSERT_BASE(struct pctrie *ptree, void *parentp, \
uint64_t *val, uint64_t *found, struct type **found_out) \
{ \ { \
struct pctrie_node *parent; \ struct pctrie_node *parent; \
void *parentp; \
uint64_t *val = name##_PCTRIE_PTR2VAL(ptr); \
\ \
parentp = pctrie_insert_lookup_strict(ptree, val); \ if (__predict_false(found != NULL)) { \
if (parentp == NULL) \ *found_out = name##_PCTRIE_VAL2PTR(found); \
return (0); \ return (EEXIST); \
} \
if (parentp != NULL) { \
parent = allocfn(ptree); \ parent = allocfn(ptree); \
if (__predict_false(parent == NULL)) \ if (__predict_false(parent == NULL)) { \
if (found_out != NULL) \
*found_out = NULL; \
return (ENOMEM); \ return (ENOMEM); \
} \
pctrie_insert_node(parentp, parent, val); \ pctrie_insert_node(parentp, parent, val); \
} \
return (0); \ return (0); \
} \ } \
\ \
static __inline __unused int \ static __inline __unused int \
name##_PCTRIE_INSERT(struct pctrie *ptree, struct type *ptr) \
{ \
void *parentp; \
uint64_t *val = name##_PCTRIE_PTR2VAL(ptr); \
\
parentp = pctrie_insert_lookup_strict(ptree, val); \
return (name##_PCTRIE_INSERT_BASE(ptree, parentp, val, \
NULL, NULL)); \
} \
\
static __inline __unused int \
name##_PCTRIE_FIND_OR_INSERT(struct pctrie *ptree, struct type *ptr, \ name##_PCTRIE_FIND_OR_INSERT(struct pctrie *ptree, struct type *ptr, \
struct type **found_out_opt) \ struct type **found_out_opt) \
{ \ { \
struct pctrie_node *parent; \
void *parentp; \ void *parentp; \
uint64_t *val = name##_PCTRIE_PTR2VAL(ptr); \ uint64_t *val = name##_PCTRIE_PTR2VAL(ptr); \
uint64_t *found; \ uint64_t *found; \
\ \
parentp = pctrie_insert_lookup(ptree, val, &found); \ parentp = pctrie_insert_lookup(ptree, val, &found); \
if (found != NULL) { \ return (name##_PCTRIE_INSERT_BASE(ptree, parentp, val, \
if (found_out_opt != NULL) \ found, found_out_opt)); \
*found_out_opt = name##_PCTRIE_VAL2PTR(found); \
return (EEXIST); \
} \ } \
if (parentp == NULL) \
return (0); \
parent = allocfn(ptree); \
if (__predict_false(parent == NULL)) \
return (ENOMEM); \
pctrie_insert_node(parentp, parent, val); \
return (0); \
} \
\ \
static __inline __unused int \ static __inline __unused int \
name##_PCTRIE_INSERT_LOOKUP_GE(struct pctrie *ptree, struct type *ptr, \ name##_PCTRIE_INSERT_LOOKUP_GE(struct pctrie *ptree, struct type *ptr, \
struct type **found_out) \ struct type **found_out) \
{ \ { \
struct pctrie_node *parent, *neighbor; \ struct pctrie_node *neighbor; \
void *parentp; \ void *parentp; \
uint64_t *val = name##_PCTRIE_PTR2VAL(ptr); \ uint64_t *val = name##_PCTRIE_PTR2VAL(ptr); \
uint64_t *found; \ uint64_t *found; \
int retval; \
\ \
parentp = pctrie_insert_lookup_gt(ptree, val, &found, \ parentp = pctrie_insert_lookup_gt(ptree, val, &found, \
&neighbor); \ &neighbor); \
if (__predict_false(found != NULL)) { \ retval = name##_PCTRIE_INSERT_BASE(ptree, parentp, val, \
*found_out = name##_PCTRIE_VAL2PTR(found); \ found, found_out); \
return (EEXIST); \ if (retval != 0) \
} \ return (retval); \
if (parentp != NULL) { \
parent = allocfn(ptree); \
if (__predict_false(parent == NULL)) { \
*found_out = NULL; \
return (ENOMEM); \
} \
pctrie_insert_node(parentp, parent, val); \
} \
found = pctrie_subtree_lookup_gt(neighbor, *val); \ found = pctrie_subtree_lookup_gt(neighbor, *val); \
*found_out = name##_PCTRIE_VAL2PTR(found); \ *found_out = name##_PCTRIE_VAL2PTR(found); \
pctrie_subtree_lookup_gt_assert(neighbor, *val, ptree, found); \ pctrie_subtree_lookup_gt_assert(neighbor, *val, ptree, found); \
return (0); \ return (0); \
} \ } \
\ \
static __inline __unused int \ static __inline __unused int \
name##_PCTRIE_INSERT_LOOKUP_LE(struct pctrie *ptree, struct type *ptr, \ name##_PCTRIE_INSERT_LOOKUP_LE(struct pctrie *ptree, struct type *ptr, \
struct type **found_out) \ struct type **found_out) \
{ \ { \
struct pctrie_node *parent, *neighbor; \ struct pctrie_node *neighbor; \
void *parentp; \ void *parentp; \
uint64_t *val = name##_PCTRIE_PTR2VAL(ptr); \ uint64_t *val = name##_PCTRIE_PTR2VAL(ptr); \
uint64_t *found; \ uint64_t *found; \
int retval; \
\ \
parentp = pctrie_insert_lookup_lt(ptree, val, &found, \ parentp = pctrie_insert_lookup_lt(ptree, val, &found, \
&neighbor); \ &neighbor); \
if (__predict_false(found != NULL)) { \ retval = name##_PCTRIE_INSERT_BASE(ptree, parentp, val, \
*found_out = name##_PCTRIE_VAL2PTR(found); \ found, found_out); \
return (EEXIST); \ if (retval != 0) \
} \ return (retval); \
if (parentp != NULL) { \
parent = allocfn(ptree); \
if (__predict_false(parent == NULL)) { \
*found_out = NULL; \
return (ENOMEM); \
} \
pctrie_insert_node(parentp, parent, val); \
} \
found = pctrie_subtree_lookup_lt(neighbor, *val); \ found = pctrie_subtree_lookup_lt(neighbor, *val); \
*found_out = name##_PCTRIE_VAL2PTR(found); \ *found_out = name##_PCTRIE_VAL2PTR(found); \
pctrie_subtree_lookup_lt_assert(neighbor, *val, ptree, found); \ pctrie_subtree_lookup_lt_assert(neighbor, *val, ptree, found); \
return (0); \ return (0); \
} \ } \
\ \
static __inline __unused struct type * \ static __inline __unused struct type * \
name##_PCTRIE_LOOKUP(struct pctrie *ptree, uint64_t key) \ name##_PCTRIE_LOOKUP(struct pctrie *ptree, uint64_t key) \
▲ Show 20 Lines • Show All 297 Lines • Show Last 20 Lines