|
 |
ee47b4 |
From dff810b2e546eb74e8b9cebb7185ca5bcb5ecc9d Mon Sep 17 00:00:00 2001
|
|
|
ee47b4 |
From: Thomas Richter <tmricht@linux.vnet.ibm.com>
|
|
|
ee47b4 |
Date: Wed, 21 Jan 2015 03:35:59 +0000
|
|
|
ee47b4 |
Subject: [PATCH] VDP: vdp22_cmds retrieve vsi paramenter data
|
|
|
ee47b4 |
|
|
|
ee47b4 |
This patch adds support for the retrieval of the
|
|
|
ee47b4 |
vsi parameter data to a command line client.
|
|
|
ee47b4 |
|
|
|
ee47b4 |
Signed-off-by: Thomas Richter <tmricht@linux.vnet.ibm.com>
|
|
|
ee47b4 |
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
|
|
|
ee47b4 |
---
|
|
|
ee47b4 |
include/qbg_vdpnl.h | 1 +
|
|
|
ee47b4 |
qbg/vdp22_cmds.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
|
ee47b4 |
2 files changed, 64 insertions(+)
|
|
|
ee47b4 |
|
|
|
ee47b4 |
diff --git a/include/qbg_vdpnl.h b/include/qbg_vdpnl.h
|
|
|
ee47b4 |
index 7b26bc7..510a20c 100644
|
|
|
ee47b4 |
--- a/include/qbg_vdpnl.h
|
|
|
ee47b4 |
+++ b/include/qbg_vdpnl.h
|
|
|
ee47b4 |
@@ -78,4 +78,5 @@ int event_trigger(struct nlmsghdr *, pid_t);
|
|
|
ee47b4 |
int vdp_str2vdpnl(char *, struct vdpnl_vsi *, char *);
|
|
|
ee47b4 |
int vdp_vdpnl2str(struct vdpnl_vsi *, char *, size_t);
|
|
|
ee47b4 |
int vdp22_sendevent(struct vdpnl_vsi *);
|
|
|
ee47b4 |
+void vdp22_freemaclist(struct vdpnl_vsi *);
|
|
|
ee47b4 |
#endif
|
|
|
ee47b4 |
diff --git a/qbg/vdp22_cmds.c b/qbg/vdp22_cmds.c
|
|
|
ee47b4 |
index a75c02d..f055441 100644
|
|
|
ee47b4 |
--- a/qbg/vdp22_cmds.c
|
|
|
ee47b4 |
+++ b/qbg/vdp22_cmds.c
|
|
|
ee47b4 |
@@ -471,10 +471,73 @@ static int test_arg_vsi(struct cmd *cmd, UNUSED char *arg, char *argvalue,
|
|
|
ee47b4 |
return set_arg_vsi2(cmd, argvalue, true);
|
|
|
ee47b4 |
}
|
|
|
ee47b4 |
|
|
|
ee47b4 |
+/*
|
|
|
ee47b4 |
+ * Concatenate all VSI information into one string.
|
|
|
ee47b4 |
+ * Return length of string in bytes.
|
|
|
ee47b4 |
+ */
|
|
|
ee47b4 |
+static int catvsis(struct vdpnl_vsi *vsi, char *out, size_t out_len)
|
|
|
ee47b4 |
+{
|
|
|
ee47b4 |
+ int rc, i;
|
|
|
ee47b4 |
+ size_t used = 0;
|
|
|
ee47b4 |
+ unsigned char wanted_req = vsi->request;
|
|
|
ee47b4 |
+
|
|
|
ee47b4 |
+ for (i = 1; vdp22_status(i, vsi, 1) > 0; ++i) {
|
|
|
ee47b4 |
+ if (wanted_req != vsi->request) {
|
|
|
ee47b4 |
+ vdp22_freemaclist(vsi);
|
|
|
ee47b4 |
+ continue;
|
|
|
ee47b4 |
+ }
|
|
|
ee47b4 |
+ rc = vdp_vdpnl2str(vsi, out + used, out_len - used);
|
|
|
ee47b4 |
+ vdp22_freemaclist(vsi);
|
|
|
ee47b4 |
+ if (rc) {
|
|
|
ee47b4 |
+ strcat(out, ";");
|
|
|
ee47b4 |
+ used = strlen(out);
|
|
|
ee47b4 |
+ } else
|
|
|
ee47b4 |
+ return 0;
|
|
|
ee47b4 |
+ }
|
|
|
ee47b4 |
+ return used;
|
|
|
ee47b4 |
+}
|
|
|
ee47b4 |
+
|
|
|
ee47b4 |
+/*
|
|
|
ee47b4 |
+ * Return all VSIs on a particular interface into one string.
|
|
|
ee47b4 |
+ */
|
|
|
ee47b4 |
+static int get_arg_vsi(struct cmd *cmd, char *arg, UNUSED char *argvalue,
|
|
|
ee47b4 |
+ char *obuf, int obuf_len)
|
|
|
ee47b4 |
+{
|
|
|
ee47b4 |
+ cmd_status good_cmd = vdp22_cmdok(cmd, cmd_gettlv);
|
|
|
ee47b4 |
+ struct vdpnl_vsi vsi;
|
|
|
ee47b4 |
+ char vsi_str[MAX_CLIF_MSGBUF];
|
|
|
ee47b4 |
+ int rc;
|
|
|
ee47b4 |
+
|
|
|
ee47b4 |
+ if (good_cmd != cmd_success)
|
|
|
ee47b4 |
+ return good_cmd;
|
|
|
ee47b4 |
+ if (!port_find_by_ifindex(get_ifidx(cmd->ifname)))
|
|
|
ee47b4 |
+ return cmd_device_not_found;
|
|
|
ee47b4 |
+ good_cmd = ifok(cmd);
|
|
|
ee47b4 |
+ if (good_cmd != cmd_success)
|
|
|
ee47b4 |
+ return good_cmd;
|
|
|
ee47b4 |
+
|
|
|
ee47b4 |
+ memset(obuf, 0, obuf_len);
|
|
|
ee47b4 |
+ memset(&vsi, 0, sizeof(vsi));
|
|
|
ee47b4 |
+ vsi.request = cmd->tlvid;
|
|
|
ee47b4 |
+ strncpy(vsi.ifname, cmd->ifname, sizeof(vsi.ifname) - 1);
|
|
|
ee47b4 |
+ good_cmd = cmd_failed;
|
|
|
ee47b4 |
+ if (!catvsis(&vsi, vsi_str, sizeof(vsi_str)))
|
|
|
ee47b4 |
+ goto out;
|
|
|
ee47b4 |
+ rc = snprintf(obuf, obuf_len, "%02x%s%04x%s",
|
|
|
ee47b4 |
+ (unsigned int)strlen(arg), arg, (unsigned int)strlen(vsi_str),
|
|
|
ee47b4 |
+ vsi_str);
|
|
|
ee47b4 |
+ if (rc > 0 || rc < obuf_len)
|
|
|
ee47b4 |
+ good_cmd = cmd_success;
|
|
|
ee47b4 |
+out:
|
|
|
ee47b4 |
+ return good_cmd;
|
|
|
ee47b4 |
+}
|
|
|
ee47b4 |
+
|
|
|
ee47b4 |
+
|
|
|
ee47b4 |
static struct arg_handlers arg_handlers[] = {
|
|
|
ee47b4 |
{
|
|
|
ee47b4 |
.arg = ARG_VDP22_VSI,
|
|
|
ee47b4 |
.arg_class = TLV_ARG,
|
|
|
ee47b4 |
+ .handle_get = get_arg_vsi,
|
|
|
ee47b4 |
.handle_set = set_arg_vsi,
|
|
|
ee47b4 |
.handle_test = test_arg_vsi
|
|
|
ee47b4 |
},
|
|
|
ee47b4 |
--
|
|
|
ee47b4 |
2.1.0
|
|
|
ee47b4 |
|