From patchwork Thu Sep 13 17:19:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Wise X-Patchwork-Id: 1004622 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=opengridcomputing.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 434mJm4BgLz9s2P for ; Thu, 29 Nov 2018 03:27:20 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728899AbeK2D3b (ORCPT ); Wed, 28 Nov 2018 22:29:31 -0500 Received: from opengridcomputing.com ([72.48.214.68]:32800 "EHLO smtp.opengridcomputing.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728181AbeK2D3b (ORCPT ); Wed, 28 Nov 2018 22:29:31 -0500 Received: by smtp.opengridcomputing.com (Postfix, from userid 503) id 4B45A227A0; Wed, 28 Nov 2018 10:27:18 -0600 (CST) Message-Id: <7026be07534b14fd74e592c315523c57fde05a0a.1543422310.git.swise@opengridcomputing.com> In-Reply-To: References: From: Steve Wise Date: Thu, 13 Sep 2018 10:19:21 -0700 Subject: [PATCH RFC iproute2-next 1/2] rdma: add 'link add/delete' commands To: dsahern@gmail.com, leon@kernel.org Cc: stephen@networkplumber.org, netdev@vger.kernel.org, linux-rdma@vger.kernel.org, leon@kernel.org, BMT@zurich.ibm.com Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add new 'link' subcommand 'add' and 'delete' to allow binding a soft-rdma device to a netdev interface. EG: rdma link add rxe_eth0 type rxe dev eth0 rdma link delete rxe_eth0 Signed-off-by: Steve Wise --- rdma/link.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ rdma/rdma.h | 1 + rdma/utils.c | 2 +- 3 files changed, 108 insertions(+), 1 deletion(-) diff --git a/rdma/link.c b/rdma/link.c index 7a6d4b7e356d..d4f76b0ce11f 100644 --- a/rdma/link.c +++ b/rdma/link.c @@ -14,6 +14,8 @@ 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 dev DEV\n", rd->filename); + pr_out("Usage: %s link delete NAME type TYPE\n", rd->filename); return 0; } @@ -315,10 +317,114 @@ static int link_show(struct rd *rd) return rd_exec_link(rd, link_one_show, true); } +static int link_add_parse_cb(const struct nlmsghdr *nlh, void *data) +{ + return MNL_CB_OK; +} + +static int link_add(struct rd *rd) +{ + char *name; + char *type = NULL; + char *dev = NULL; + uint32_t seq; + int ret; + + if (rd_no_arg(rd)) { + pr_err("No link name was supplied\n"); + return -EINVAL; + } + name = rd_argv(rd); + rd_arg_inc(rd); + while (!rd_no_arg(rd)) { + if (rd_argv_match(rd, "type")) { + rd_arg_inc(rd); + type = rd_argv(rd); + } else if (rd_argv_match(rd, "dev")) { + rd_arg_inc(rd); + dev = rd_argv(rd); + } else { + pr_err("Invalid parameter %s\n", rd_argv(rd)); + return -EINVAL; + } + rd_arg_inc(rd); + } + if (!type) { + pr_err("No type was supplied\n"); + return -EINVAL; + } + if (!dev) { + pr_err("No net device was supplied\n"); + return -EINVAL; + } + + 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, name); + mnl_attr_put_strz(rd->nlh, RDMA_NLDEV_ATTR_LINK_TYPE, type); + mnl_attr_put_strz(rd->nlh, RDMA_NLDEV_ATTR_NDEV_NAME, dev); + ret = rd_send_msg(rd); + if (ret) + return ret; + + ret = rd_recv_msg(rd, link_add_parse_cb, rd, seq); + if (ret) + perror(NULL); + return ret; +} + +static int link_del_parse_cb(const struct nlmsghdr *nlh, void *data) +{ + return MNL_CB_OK; +} + +static int link_del(struct rd *rd) +{ + char *name; + char *type = NULL; + uint32_t seq; + int ret; + + if (rd_no_arg(rd)) { + pr_err("No link type was supplied\n"); + return -EINVAL; + } + name = rd_argv(rd); + rd_arg_inc(rd); + while (!rd_no_arg(rd)) { + if (rd_argv_match(rd, "type")) { + rd_arg_inc(rd); + type = rd_argv(rd); + } else { + pr_err("Invalid parameter %s\n", rd_argv(rd)); + return -EINVAL; + } + rd_arg_inc(rd); + } + if (!type) { + pr_err("No type was supplied\n"); + return -EINVAL; + } + rd_prepare_msg(rd, RDMA_NLDEV_CMD_DELLINK, &seq, + (NLM_F_REQUEST | NLM_F_ACK)); + mnl_attr_put_strz(rd->nlh, RDMA_NLDEV_ATTR_DEV_NAME, name); + mnl_attr_put_strz(rd->nlh, RDMA_NLDEV_ATTR_LINK_TYPE, type); + ret = rd_send_msg(rd); + if (ret) + return ret; + + ret = rd_recv_msg(rd, link_del_parse_cb, rd, seq); + if (ret) + perror(NULL); + return ret; +} + 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 }, diff --git a/rdma/rdma.h b/rdma/rdma.h index 547bb5749a39..b5271e423c10 100644 --- a/rdma/rdma.h +++ b/rdma/rdma.h @@ -79,6 +79,7 @@ struct rd_cmd { */ bool rd_no_arg(struct rd *rd); void rd_arg_inc(struct rd *rd); +bool rd_argv_match(struct rd *rd, const char *pattern); char *rd_argv(struct rd *rd); diff --git a/rdma/utils.c b/rdma/utils.c index 61f4aeb1bcf2..41f8f7391279 100644 --- a/rdma/utils.c +++ b/rdma/utils.c @@ -32,7 +32,7 @@ int strcmpx(const char *str1, const char *str2) return strncmp(str1, str2, strlen(str1)); } -static bool rd_argv_match(struct rd *rd, const char *pattern) +bool rd_argv_match(struct rd *rd, const char *pattern) { if (!rd_argc(rd)) return false; From patchwork Wed Nov 28 15:16:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Wise X-Patchwork-Id: 1004623 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=opengridcomputing.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 434mJs6KCfz9s2P for ; Thu, 29 Nov 2018 03:27:25 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729067AbeK2D3g (ORCPT ); Wed, 28 Nov 2018 22:29:36 -0500 Received: from opengridcomputing.com ([72.48.214.68]:32824 "EHLO smtp.opengridcomputing.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728914AbeK2D3g (ORCPT ); Wed, 28 Nov 2018 22:29:36 -0500 Received: by smtp.opengridcomputing.com (Postfix, from userid 503) id 535AD227A0; Wed, 28 Nov 2018 10:27:23 -0600 (CST) Message-Id: In-Reply-To: References: From: Steve Wise Date: Wed, 28 Nov 2018 07:16:38 -0800 Subject: [PATCH RFC iproute2-next 2/2] rdma: man page update for link add/delete To: dsahern@gmail.com, leon@kernel.org Cc: stephen@networkplumber.org, netdev@vger.kernel.org, linux-rdma@vger.kernel.org, leon@kernel.org, BMT@zurich.ibm.com Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Update the 'rdma link' man page with 'link add/delete' info. Signed-off-by: Steve Wise --- man/man8/rdma-link.8 | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/man/man8/rdma-link.8 b/man/man8/rdma-link.8 index 97dd8bb994d2..b994c326dc34 100644 --- a/man/man8/rdma-link.8 +++ b/man/man8/rdma-link.8 @@ -23,6 +23,20 @@ rdma-link \- rdma link configuration .RI "[ " DEV/PORT_INDEX " ]" .ti -8 +.B rdma link add +.BR NAME +.BR type +.BR TYPE +.BR dev +.BR NETDEV + +.ti -8 +.B rdma link delete +.RI NAME +.BR type +.BR TYPE + +.ti -8 .B rdma link help .SH "DESCRIPTION" @@ -33,6 +47,33 @@ rdma-link \- rdma link configuration - specifies the RDMA link to show. If this argument is omitted all links are listed. +.SS rdma link add NAME type TYPE dev NETDEV - add an rdma link for the specified type to the network device +.sp +.BR NAME +- specifies the new name of the rdma link to add + +.BR TYPE +- specifies which rdma type to use. Link types: +.sp +.in +8 +.B rxe +- Soft RoCE driver +.sp +.B siw +- Soft iWARP driver +.in -8 + +.BR NETDEV +- specifies the network device to which the link is bound + +.SS rdma link delete NAME type TYPE - delete an rdma link for the specified type +.PP +.BR NAME +- specifies the name of the rdma link to delete +.PP +.BR TYPE +- specifies which rdma type to use + .SH "EXAMPLES" .PP rdma link show @@ -45,6 +86,16 @@ rdma link show mlx5_2/1 Shows the state of specified rdma link. .RE .PP +rdma link add siw_eth0 type rxe dev eth0 +.RS 4 +Adds a RXE link named siw_eth0 to network device eth0 +.RE +.PP +rdma link del siw_eth0 type rxe +.RS 4 +Removes RXE link siw_eth0 +.RE +.PP .SH SEE ALSO .BR rdma (8),