Merge branch 'iproute2-master' into next

[mirror_iproute2.git] / rdma / link.c

diff --git a/rdma/link.c b/rdma/link.c
index 7a6d4b7e356d7ee228df6921941067e41a538f08..10b2e513e98af29ecbe375103795e95d32431c5a 100644 (file)
--- a/rdma/link.c
+++ b/rdma/link.c
@@ -1,11 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB
 /*
  * link.c      RDMA tool
- *
- *              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 (at your option) any later version.
- *
  * Authors:     Leon Romanovsky <leonro@mellanox.com>
  */
 
@@ -14,12 +9,15 @@
 static int link_help(struct rd *rd)
 {
        pr_out("Usage: %s link show [DEV/PORT_INDEX]\n", rd->filename);
+       pr_out("Usage: %s link add NAME type TYPE netdev NETDEV\n",
+              rd->filename);
+       pr_out("Usage: %s link delete NAME\n", rd->filename);
        return 0;
 }
 
 static const char *caps_to_str(uint32_t idx)
 {
-#define RDMA_PORT_FLAGS(x) \
+#define RDMA_PORT_FLAGS_LOW(x) \
        x(RESERVED, 0) \
        x(SM, 1) \
        x(NOTICE, 2) \
@@ -53,13 +51,39 @@ static const char *caps_to_str(uint32_t idx)
        x(MULT_FDB, 30) \
        x(HIERARCHY_INFO, 31)
 
-       enum { RDMA_PORT_FLAGS(RDMA_BITMAP_ENUM) };
+#define RDMA_PORT_FLAGS_HIGH(x) \
+       x(SET_NODE_DESC, 0) \
+       x(EXT_INFO, 1) \
+       x(VIRT, 2) \
+       x(SWITCH_POR_STATE_TABLE, 3) \
+       x(LINK_WIDTH_2X, 4) \
+       x(LINK_SPEED_HDR, 5)
+
+       /*
+        * Separation below is needed to allow compilation of rdmatool
+        * on 32bits systems. On such systems, C-enum is limited to be
+        * int and can't hold more than 32 bits.
+        */
+       enum { RDMA_PORT_FLAGS_LOW(RDMA_BITMAP_ENUM) };
+       enum { RDMA_PORT_FLAGS_HIGH(RDMA_BITMAP_ENUM) };
 
        static const char * const
-               rdma_port_names[] = { RDMA_PORT_FLAGS(RDMA_BITMAP_NAMES) };
-       #undef RDMA_PORT_FLAGS
+               rdma_port_names_low[] = { RDMA_PORT_FLAGS_LOW(RDMA_BITMAP_NAMES) };
+       static const char * const
+               rdma_port_names_high[] = { RDMA_PORT_FLAGS_HIGH(RDMA_BITMAP_NAMES) };
+       uint32_t high_idx;
+       #undef RDMA_PORT_FLAGS_LOW
+       #undef RDMA_PORT_FLAGS_HIGH
+
+       if (idx < ARRAY_SIZE(rdma_port_names_low) && rdma_port_names_low[idx])
+               return rdma_port_names_low[idx];
+
+       high_idx = idx - ARRAY_SIZE(rdma_port_names_low);
+       if (high_idx < ARRAY_SIZE(rdma_port_names_high) &&
+           rdma_port_names_high[high_idx])
+               return rdma_port_names_high[high_idx];
 
-       return rdma_port_names[idx];
+       return "UNKNOWN";
 }
 
 static void link_print_caps(struct rd *rd, struct nlattr **tb)
@@ -315,10 +339,85 @@ static int link_show(struct rd *rd)
        return rd_exec_link(rd, link_one_show, true);
 }
 
+static int link_add_netdev(struct rd *rd)
+{
+       char *link_netdev;
+       uint32_t seq;
+
+       if (rd_no_arg(rd)) {
+               pr_err("Please provide a net device name.\n");
+               return -EINVAL;
+       }
+
+       link_netdev = rd_argv(rd);
+       rd_prepare_msg(rd, RDMA_NLDEV_CMD_NEWLINK, &seq,
+                      (NLM_F_REQUEST | NLM_F_ACK));
+       mnl_attr_put_strz(rd->nlh, RDMA_NLDEV_ATTR_DEV_NAME, rd->link_name);
+       mnl_attr_put_strz(rd->nlh, RDMA_NLDEV_ATTR_LINK_TYPE, rd->link_type);
+       mnl_attr_put_strz(rd->nlh, RDMA_NLDEV_ATTR_NDEV_NAME, link_netdev);
+       return rd_sendrecv_msg(rd, seq);
+}
+
+static int link_add_type(struct rd *rd)
+{
+       const struct rd_cmd cmds[] = {
+               { NULL,         link_help},
+               { "netdev",     link_add_netdev},
+               { 0 }
+       };
+
+       if (rd_no_arg(rd)) {
+               pr_err("Please provide a link type name.\n");
+               return -EINVAL;
+       }
+       rd->link_type = rd_argv(rd);
+       rd_arg_inc(rd);
+       return rd_exec_cmd(rd, cmds, "parameter");
+}
+
+static int link_add(struct rd *rd)
+{
+       const struct rd_cmd cmds[] = {
+               { NULL,         link_help},
+               { "type",       link_add_type},
+               { 0 }
+       };
+
+       if (rd_no_arg(rd)) {
+               pr_err("Please provide a link name to add.\n");
+               return -EINVAL;
+       }
+       rd->link_name = rd_argv(rd);
+       rd_arg_inc(rd);
+
+       return rd_exec_cmd(rd, cmds, "parameter");
+}
+
+static int _link_del(struct rd *rd)
+{
+       uint32_t seq;
+
+       if (!rd_no_arg(rd)) {
+               pr_err("Unknown parameter %s\n", rd_argv(rd));
+               return -EINVAL;
+       }
+       rd_prepare_msg(rd, RDMA_NLDEV_CMD_DELLINK, &seq,
+                      (NLM_F_REQUEST | NLM_F_ACK));
+       mnl_attr_put_u32(rd->nlh, RDMA_NLDEV_ATTR_DEV_INDEX, rd->dev_idx);
+       return rd_sendrecv_msg(rd, seq);
+}
+
+static int link_del(struct rd *rd)
+{
+       return rd_exec_require_dev(rd, _link_del);
+}
+
 int cmd_link(struct rd *rd)
 {
        const struct rd_cmd cmds[] = {
                { NULL,         link_show },
+               { "add",        link_add },
+               { "delete",     link_del },
                { "show",       link_show },
                { "list",       link_show },
                { "help",       link_help },