Page MenuHomeFreeBSD
Files F177608524

D44713.1794831625.diff
No OneTemporary
Actions

Authored By
Unknown
Size
4 KB
Referenced Files
None
Subscribers
None

D44713.1794831625.diff
View Options

diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
--- a/sbin/camcontrol/camcontrol.c
+++ b/sbin/camcontrol/camcontrol.c
@@ -61,6 +61,7 @@
#include <camlib.h>
#include "camcontrol.h"
#ifdef WITH_NVME
+#include <dev/nvmf/nvmf_proto.h>
#include "nvmecontrol_ext.h"
#endif
@@ -5275,6 +5276,28 @@
return (retval);
}
+#ifdef WITH_NVME
+static const char *
+nvmf_transport_type(uint8_t trtype)
+{
+ static char buf[8];
+
+ switch (trtype) {
+ case NVMF_TRTYPE_RDMA:
+ return ("RDMA");
+ case NVMF_TRTYPE_FC:
+ return ("Fibre Channel");
+ case NVMF_TRTYPE_TCP:
+ return ("TCP");
+ case NVMF_TRTYPE_INTRA_HOST:
+ return ("Intra-host");
+ default:
+ snprintf(buf, sizeof(buf), "0x%02x\n", trtype);
+ return (buf);
+ }
+}
+#endif
+
static void
cts_print(struct cam_device *device, struct ccb_trans_settings *cts)
{
@@ -5412,19 +5435,33 @@
}
#ifdef WITH_NVME
if (cts->protocol == PROTO_NVME) {
- struct ccb_trans_settings_nvme *nvmex =
- &cts->xport_specific.nvme;
+ struct ccb_trans_settings_nvme *nvme =
+ &cts->proto_specific.nvme;
- if (nvmex->valid & CTS_NVME_VALID_SPEC) {
+ if (nvme->valid & CTS_NVME_VALID_SPEC) {
fprintf(stdout, "%sNVMe Spec: %d.%d\n", pathstr,
- NVME_MAJOR(nvmex->spec),
- NVME_MINOR(nvmex->spec));
+ NVME_MAJOR(nvme->spec),
+ NVME_MINOR(nvme->spec));
}
- if (nvmex->valid & CTS_NVME_VALID_LINK) {
+ }
+ if (cts->transport == XPORT_NVME) {
+ struct ccb_trans_settings_nvme *nvme =
+ &cts->xport_specific.nvme;
+
+ if (nvme->valid & CTS_NVME_VALID_LINK) {
fprintf(stdout, "%sPCIe lanes: %d (%d max)\n", pathstr,
- nvmex->lanes, nvmex->max_lanes);
+ nvme->lanes, nvme->max_lanes);
fprintf(stdout, "%sPCIe Generation: %d (%d max)\n", pathstr,
- nvmex->speed, nvmex->max_speed);
+ nvme->speed, nvme->max_speed);
+ }
+ }
+ if (cts->transport == XPORT_NVMF) {
+ struct ccb_trans_settings_nvmf *nvmf =
+ &cts->xport_specific.nvmf;
+
+ if (nvmf->valid & CTS_NVMF_VALID_TRTYPE) {
+ fprintf(stdout, "%sTransport: %s\n", pathstr,
+ nvmf_transport_type(nvmf->trtype));
}
}
#endif
diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h
--- a/sys/cam/cam_ccb.h
+++ b/sys/cam/cam_ccb.h
@@ -297,9 +297,10 @@
XPORT_SRP, /* SCSI RDMA Protocol */
XPORT_NVME, /* NVMe over PCIe */
XPORT_MMCSD, /* MMC, SD, SDIO card */
+ XPORT_NVMF, /* NVMe over Fabrics */
} cam_xport;
-#define XPORT_IS_NVME(t) ((t) == XPORT_NVME)
+#define XPORT_IS_NVME(t) ((t) == XPORT_NVME || (t) == XPORT_NVMF)
#define XPORT_IS_ATA(t) ((t) == XPORT_ATA || (t) == XPORT_SATA)
#define XPORT_IS_SCSI(t) ((t) != XPORT_UNKNOWN && \
(t) != XPORT_UNSPECIFIED && \
@@ -653,6 +654,12 @@
_Static_assert(sizeof(struct ccb_pathinq_settings_nvme) == 64,
"ccb_pathinq_settings_nvme too big");
+struct ccb_pathinq_settings_nvmf {
+ uint32_t nsid; /* Namespace ID for this path */
+ uint8_t trtype;
+ char dev_name[NVME_DEV_NAME_LEN]; /* nvme controller dev name for this device */
+};
+
#define PATHINQ_SETTINGS_SIZE 128
struct ccb_pathinq {
@@ -684,6 +691,7 @@
struct ccb_pathinq_settings_fc fc;
struct ccb_pathinq_settings_sas sas;
struct ccb_pathinq_settings_nvme nvme;
+ struct ccb_pathinq_settings_nvmf nvmf;
char ccb_pathinq_settings_opaque[PATHINQ_SETTINGS_SIZE];
} xport_specific;
u_int maxio; /* Max supported I/O size, in bytes. */
@@ -1050,6 +1058,13 @@
uint8_t max_speed; /* PCIe generation for each lane */
};
+struct ccb_trans_settings_nvmf
+{
+ u_int valid; /* Which fields to honor */
+#define CTS_NVMF_VALID_TRTYPE 0x01
+ uint8_t trtype;
+};
+
#include <cam/mmc/mmc_bus.h>
struct ccb_trans_settings_mmc {
struct mmc_ios ios;
@@ -1122,6 +1137,7 @@
struct ccb_trans_settings_pata ata;
struct ccb_trans_settings_sata sata;
struct ccb_trans_settings_nvme nvme;
+ struct ccb_trans_settings_nvmf nvmf;
} xport_specific;
};
diff --git a/sys/cam/nvme/nvme_xpt.c b/sys/cam/nvme/nvme_xpt.c
--- a/sys/cam/nvme/nvme_xpt.c
+++ b/sys/cam/nvme/nvme_xpt.c
@@ -175,6 +175,7 @@
CAM_XPT_XPORT(nvme_xport_ ## x);
NVME_XPT_XPORT(nvme, NVME);
+NVME_XPT_XPORT(nvmf, NVMF);
#undef NVME_XPT_XPORT

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 16, 12:20 PM (17 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41777382
Default Alt Text
D44713.1794831625.diff (4 KB)

Event Timeline