[infiniband] Add "ibstat" command

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/config/config_infiniband.c b/src/config/config_infiniband.c
index a742e7559a41f06bbc3f16cd923eb58b2ad8cd12..8c63fb00e383ee32e695b397a33d143301c7fd31 100644 (file)
--- a/src/config/config_infiniband.c
+++ b/src/config/config_infiniband.c
@@ -37,3 +37,10 @@ PROVIDE_REQUIRING_SYMBOL();
 #ifdef SANBOOT_PROTO_IB_SRP
 REQUIRE_OBJECT ( ib_srp );
 #endif
+
+/*
+ * Drag in Infiniband-specific commands
+ */
+#ifdef IBMGMT_CMD
+REQUIRE_OBJECT ( ibmgmt_cmd );
+#endif

diff --git a/src/config/general.h b/src/config/general.h
index ee15f6bf1486b4c7adfee3818246d80912a44855..dba412128f5e1b78bded99f0ba02e8d6c78d4187 100644 (file)
--- a/src/config/general.h
+++ b/src/config/general.h
@@ -120,6 +120,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #define        CONFIG_CMD              /* Option configuration console */
 #define        IFMGMT_CMD              /* Interface management commands */
 #define        IWMGMT_CMD              /* Wireless interface management commands */
+#define IBMGMT_CMD             /* Infiniband management commands */
 #define FCMGMT_CMD             /* Fibre Channel management commands */
 #define        ROUTE_CMD               /* Routing table management commands */
 #define IMAGE_CMD              /* Image management commands */

diff --git a/src/hci/commands/ibmgmt_cmd.c b/src/hci/commands/ibmgmt_cmd.c
new file mode 100644 (file)
index 0000000..1154d74
--- /dev/null
+++ b/src/hci/commands/ibmgmt_cmd.c
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2016 Michael Brown <mbrown@fensystems.co.uk>.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+
+#include <stdio.h>
+#include <errno.h>
+#include <getopt.h>
+#include <ipxe/command.h>
+#include <ipxe/parseopt.h>
+#include <ipxe/infiniband.h>
+#include <usr/ibmgmt.h>
+
+/** @file
+ *
+ * Infiniband device management commands
+ *
+ */
+
+/** "ibstat" options */
+struct ibstat_options {};
+
+/** "ibstat" option list */
+static struct option_descriptor ibstat_opts[] = {};
+
+/** "ibstat" command descriptor */
+static struct command_descriptor ibstat_cmd =
+       COMMAND_DESC ( struct ibstat_options, ibstat_opts, 0, 0, "" );
+
+/**
+ * The "ibstat" command
+ *
+ * @v argc             Argument count
+ * @v argv             Argument list
+ * @ret rc             Return status code
+ */
+static int ibstat_exec ( int argc, char **argv ) {
+       struct ibstat_options opts;
+       struct ib_device *ibdev;
+       int rc;
+
+       /* Parse options */
+       if ( ( rc = parse_options ( argc, argv, &ibstat_cmd, &opts ) ) != 0 )
+               return rc;
+
+       /* Show all Infiniband devices */
+       for_each_ibdev ( ibdev )
+               ibstat ( ibdev );
+
+       return 0;
+}
+
+/** Infiniband commands */
+struct command ibmgmt_commands[] __command = {
+       {
+               .name = "ibstat",
+               .exec = ibstat_exec,
+       },
+};

diff --git a/src/include/usr/ibmgmt.h b/src/include/usr/ibmgmt.h
new file mode 100644 (file)
index 0000000..16a0991
--- /dev/null
+++ b/src/include/usr/ibmgmt.h
@@ -0,0 +1,16 @@
+#ifndef _USR_IBMGMT_H
+#define _USR_IBMGMT_H
+
+/** @file
+ *
+ * Infiniband device management
+ *
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+
+struct ib_device;
+
+extern void ibstat ( struct ib_device *ibdev );
+
+#endif /* _USR_IBMGMT_H */

diff --git a/src/usr/ibmgmt.c b/src/usr/ibmgmt.c
new file mode 100644 (file)
index 0000000..7857664
--- /dev/null
+++ b/src/usr/ibmgmt.c
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2016 Michael Brown <mbrown@fensystems.co.uk>.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
+#include <byteswap.h>
+#include <ipxe/infiniband.h>
+#include <usr/ibmgmt.h>
+
+/** @file
+ *
+ * Infiniband device management
+ *
+ */
+
+/**
+ * Print status of Infiniband device
+ *
+ * @v ibdev            Infiniband device
+ */
+void ibstat ( struct ib_device *ibdev ) {
+       struct ib_queue_pair *qp;
+
+       printf ( "%s: " IB_GUID_FMT " using %s on %s port %d (%s)\n",
+                ibdev->name, IB_GUID_ARGS ( &ibdev->gid.s.guid ),
+                ibdev->dev->driver_name, ibdev->dev->name, ibdev->port,
+                ( ib_is_open ( ibdev ) ? "open" : "closed" ) );
+       if ( ib_link_ok ( ibdev ) ) {
+               printf ( "  [Link:up LID %d prefix " IB_GUID_FMT "]\n",
+                        ibdev->lid, IB_GUID_ARGS ( &ibdev->gid.s.prefix ) );
+       } else {
+               printf ( "  [Link:down, port state %d]\n", ibdev->port_state );
+       }
+       list_for_each_entry ( qp, &ibdev->qps, list ) {
+               printf ( "  QPN %#lx send %d/%d recv %d/%d %s\n",
+                        qp->qpn, qp->send.fill, qp->send.num_wqes,
+                        qp->recv.fill, qp->recv.num_wqes, qp->name );
+       }
+}