]> www.infradead.org Git - users/sagi/nvme-cli.git/commitdiff
nvme: add NVIDIA plugin for NVMe SNAP controllers
authorMax Gurtovoy <mgurtovoy@nvidia.com>
Thu, 1 Apr 2021 08:38:49 +0000 (08:38 +0000)
committerKeith Busch <kbusch@kernel.org>
Thu, 1 Apr 2021 22:19:56 +0000 (07:19 +0900)
SNAP technology is supported on NVIDIA Mellanox BlueField DPU family
and combines a unique hardware-accelerated virtualization of NVMe
devices with the advanced networking and programmability capabilities of
the BlueField SmartNIC.
Add initial vendor specific parsing for id-ctrl command of NVMe SNAP
controllers.

For more info: https://www.mellanox.com/products/software/nvme-snap

Signed-off-by: Max Gurtovoy <mgurtovoy@nvidia.com>
[merged up with "new" json usage]
Signed-off-by: Keith Busch <kbusch@kernel.org>
Makefile
plugins/nvidia/nvidia-nvme.c [new file with mode: 0644]
plugins/nvidia/nvidia-nvme.h [new file with mode: 0644]

index c36a179214583ee9e7446e51dc9edb47e97eca74..1186fe071f1e27d8dcb272643836fac647b09089 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -90,7 +90,8 @@ PLUGIN_OBJS :=                                        \
        plugins/dera/dera-nvme.o                \
        plugins/scaleflux/sfx-nvme.o            \
        plugins/transcend/transcend-nvme.o      \
-       plugins/zns/zns.o
+       plugins/zns/zns.o                       \
+       plugins/nvidia/nvidia-nvme.o
 
 nvme: nvme.c nvme.h $(OBJS) $(PLUGIN_OBJS) $(UTIL_OBJS) NVME-VERSION-FILE
        $(QUIET_CC)$(CC) $(CPPFLAGS) $(CFLAGS) $(INC) $< -o $(NVME) $(OBJS) $(PLUGIN_OBJS) $(UTIL_OBJS) $(LDFLAGS)
diff --git a/plugins/nvidia/nvidia-nvme.c b/plugins/nvidia/nvidia-nvme.c
new file mode 100644 (file)
index 0000000..cdf51ab
--- /dev/null
@@ -0,0 +1,58 @@
+#include <fcntl.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <inttypes.h>
+
+#include "linux/nvme_ioctl.h"
+
+#include "common.h"
+#include "nvme.h"
+#include "nvme-print.h"
+#include "nvme-ioctl.h"
+#include "plugin.h"
+
+#include "argconfig.h"
+#include "suffix.h"
+
+#define CREATE_CMD
+#include "nvidia-nvme.h"
+
+struct nvme_vu_id_ctrl_field {
+       __u16           json_rpc_2_0_mjr;
+       __u16           json_rpc_2_0_mnr;
+       __u16           json_rpc_2_0_ter;
+       __u8            reserved0[1018];
+};
+
+static void json_nvidia_id_ctrl(struct nvme_vu_id_ctrl_field *id,
+               char *json_rpc_2_0_ver, struct json_object *root)
+{
+       json_object_add_value_string(root, "json_rpc_2_0_ver",
+                                    json_rpc_2_0_ver);
+}
+
+static void nvidia_id_ctrl(__u8 *vs, struct json_object *root)
+{
+       struct nvme_vu_id_ctrl_field *id = (struct nvme_vu_id_ctrl_field *)vs;
+       char json_rpc_2_0_ver[16] = { 0 };
+
+       snprintf(json_rpc_2_0_ver, sizeof(json_rpc_2_0_ver), "0x%04x%04x%04x",
+                le16_to_cpu(id->json_rpc_2_0_mjr),
+                le16_to_cpu(id->json_rpc_2_0_mnr),
+                le16_to_cpu(id->json_rpc_2_0_ter));
+
+       if (root) {
+               json_nvidia_id_ctrl(id, json_rpc_2_0_ver, root);
+               return;
+       }
+
+       printf("json_rpc_2_0_ver : %s\n", json_rpc_2_0_ver);
+}
+
+static int id_ctrl(int argc, char **argv, struct command *cmd,
+               struct plugin *plugin)
+{
+       return __id_ctrl(argc, argv, cmd, plugin, nvidia_id_ctrl);
+}
diff --git a/plugins/nvidia/nvidia-nvme.h b/plugins/nvidia/nvidia-nvme.h
new file mode 100644 (file)
index 0000000..bf562b9
--- /dev/null
@@ -0,0 +1,17 @@
+#undef CMD_INC_FILE
+#define CMD_INC_FILE plugins/nvidia/nvidia-nvme
+
+#if !defined(NVIDIA_NVME) || defined(CMD_HEADER_MULTI_READ)
+#define NVIDIA_NVME
+
+#include "cmd.h"
+
+PLUGIN(NAME("nvidia", "NVIDIA vendor specific extensions"),
+       COMMAND_LIST(
+               ENTRY("id-ctrl", "Send NVMe Identify Controller", id_ctrl)
+       )
+);
+
+#endif
+
+#include "define_cmd.h"