@@ -8,7 +8,8 @@ DCBOBJ = dcb.o \
dcb_ets.o \
dcb_maxrate.o \
dcb_pfc.o \
- dcb_apptrust.o
+ dcb_apptrust.o \
+ dcb_rewr.o
TARGETS += dcb
LDLIBS += -lm
@@ -470,7 +470,7 @@ static void dcb_help(void)
fprintf(stderr,
"Usage: dcb [ OPTIONS ] OBJECT { COMMAND | help }\n"
" dcb [ -f | --force ] { -b | --batch } filename [ -n | --netns ] netnsname\n"
- "where OBJECT := { app | apptrust | buffer | dcbx | ets | maxrate | pfc }\n"
+ "where OBJECT := { app | apptrust | buffer | dcbx | ets | maxrate | pfc | rewr }\n"
" OPTIONS := [ -V | --Version | -i | --iec | -j | --json\n"
" | -N | --Numeric | -p | --pretty\n"
" | -s | --statistics | -v | --verbose]\n");
@@ -485,6 +485,8 @@ static int dcb_cmd(struct dcb *dcb, int argc, char **argv)
return dcb_cmd_app(dcb, argc - 1, argv + 1);
} else if (strcmp(*argv, "apptrust") == 0) {
return dcb_cmd_apptrust(dcb, argc - 1, argv + 1);
+ } else if (strcmp(*argv, "rewr") == 0) {
+ return dcb_cmd_rewr(dcb, argc - 1, argv + 1);
} else if (matches(*argv, "buffer") == 0) {
return dcb_cmd_buffer(dcb, argc - 1, argv + 1);
} else if (matches(*argv, "dcbx") == 0) {
@@ -54,6 +54,10 @@ void dcb_print_array_on_off(const __u8 *array, size_t size);
void dcb_print_array_kw(const __u8 *array, size_t array_size,
const char *const kw[], size_t kw_size);
+/* dcp_rewr.c */
+
+int dcb_cmd_rewr(struct dcb *dcb, int argc, char **argv);
+
/* dcb_app.c */
struct dcb_app_table {
@@ -70,8 +74,29 @@ struct dcb_app_parse_mapping {
int err;
};
+#define DCB_APP_PCP_MAX 15
+#define DCB_APP_DSCP_MAX 63
+
int dcb_cmd_app(struct dcb *dcb, int argc, char **argv);
+int dcb_app_get(struct dcb *dcb, const char *dev, struct dcb_app_table *tab);
+int dcb_app_add_del(struct dcb *dcb, const char *dev, int command,
+ const struct dcb_app_table *tab,
+ bool (*filter)(const struct dcb_app *));
+
+bool dcb_app_is_dscp(const struct dcb_app *app);
+bool dcb_app_is_pcp(const struct dcb_app *app);
+
+int dcb_app_print_pid_dscp(__u16 protocol);
+int dcb_app_print_pid_pcp(__u16 protocol);
+int dcb_app_print_pid_dec(__u16 protocol);
+void dcb_app_print_filtered(const struct dcb_app_table *tab,
+ bool (*filter)(const struct dcb_app *),
+ void (*print_pid_prio)(int (*print_pid)(__u16),
+ const struct dcb_app *),
+ int (*print_pid)(__u16 protocol),
+ const char *json_name, const char *fp_name);
+
enum ieee_attrs_app dcb_app_attr_type_get(__u8 selector);
bool dcb_app_attr_type_validate(enum ieee_attrs_app type);
bool dcb_app_selector_validate(enum ieee_attrs_app type, __u8 selector);
@@ -80,11 +105,18 @@ bool dcb_app_pid_eq(const struct dcb_app *aa, const struct dcb_app *ab);
bool dcb_app_prio_eq(const struct dcb_app *aa, const struct dcb_app *ab);
int dcb_app_table_push(struct dcb_app_table *tab, struct dcb_app *app);
+int dcb_app_table_copy(struct dcb_app_table *a, const struct dcb_app_table *b);
+void dcb_app_table_sort(struct dcb_app_table *tab);
+void dcb_app_table_fini(struct dcb_app_table *tab);
+void dcb_app_table_remove_existing(struct dcb_app_table *a,
+ const struct dcb_app_table *b);
void dcb_app_table_remove_replaced(struct dcb_app_table *a,
const struct dcb_app_table *b,
bool (*key_eq)(const struct dcb_app *aa,
const struct dcb_app *ab));
+int dcb_app_parse_pcp(__u32 *key, const char *arg);
+int dcb_app_parse_dscp(__u32 *key, const char *arg);
void dcb_app_parse_mapping_cb(__u32 key, __u64 value, void *data);
/* dcb_apptrust.c */
@@ -100,7 +100,7 @@ bool dcb_app_selector_validate(enum ieee_attrs_app type, __u8 selector)
return dcb_app_attr_type_get(selector) == type;
}
-static void dcb_app_table_fini(struct dcb_app_table *tab)
+void dcb_app_table_fini(struct dcb_app_table *tab)
{
free(tab->apps);
}
@@ -119,8 +119,8 @@ int dcb_app_table_push(struct dcb_app_table *tab, struct dcb_app *app)
return 0;
}
-static void dcb_app_table_remove_existing(struct dcb_app_table *a,
- const struct dcb_app_table *b)
+void dcb_app_table_remove_existing(struct dcb_app_table *a,
+ const struct dcb_app_table *b)
{
size_t ia, ja;
size_t ib;
@@ -198,8 +198,7 @@ void dcb_app_table_remove_replaced(struct dcb_app_table *a,
a->n_apps = ja;
}
-static int dcb_app_table_copy(struct dcb_app_table *a,
- const struct dcb_app_table *b)
+int dcb_app_table_copy(struct dcb_app_table *a, const struct dcb_app_table *b)
{
size_t i;
int ret;
@@ -226,7 +225,7 @@ static int dcb_app_cmp_cb(const void *a, const void *b)
return dcb_app_cmp(a, b);
}
-static void dcb_app_table_sort(struct dcb_app_table *tab)
+void dcb_app_table_sort(struct dcb_app_table *tab)
{
qsort(tab->apps, tab->n_apps, sizeof(*tab->apps), dcb_app_cmp_cb);
}
@@ -269,7 +268,7 @@ static int dcb_app_parse_mapping_ethtype_prio(__u32 key, char *value, void *data
dcb_app_parse_mapping_cb, data);
}
-static int dcb_app_parse_pcp(__u32 *key, const char *arg)
+int dcb_app_parse_pcp(__u32 *key, const char *arg)
{
int i;
@@ -295,7 +294,7 @@ static int dcb_app_parse_mapping_pcp_prio(__u32 key, char *value, void *data)
dcb_app_parse_mapping_cb, data);
}
-static int dcb_app_parse_dscp(__u32 *key, const char *arg)
+int dcb_app_parse_dscp(__u32 *key, const char *arg)
{
if (parse_mapping_num_all(key, arg) == 0)
return 0;
@@ -320,7 +319,7 @@ static int dcb_app_parse_mapping_dscp_prio(__u32 key, char *value, void *data)
if (get_u8(&prio, value, 0))
return -EINVAL;
- return dcb_parse_mapping("DSCP", key, 63,
+ return dcb_parse_mapping("DSCP", key, DCB_APP_DSCP_MAX,
"PRIO", prio, IEEE_8021QAZ_MAX_TCS - 1,
dcb_app_parse_mapping_cb, data);
}
@@ -386,12 +385,12 @@ static bool dcb_app_is_default(const struct dcb_app *app)
app->protocol == 0;
}
-static bool dcb_app_is_dscp(const struct dcb_app *app)
+bool dcb_app_is_dscp(const struct dcb_app *app)
{
return app->selector == IEEE_8021QAZ_APP_SEL_DSCP;
}
-static bool dcb_app_is_pcp(const struct dcb_app *app)
+bool dcb_app_is_pcp(const struct dcb_app *app)
{
return app->selector == DCB_APP_SEL_PCP;
}
@@ -411,7 +410,7 @@ static bool dcb_app_is_port(const struct dcb_app *app)
return app->selector == IEEE_8021QAZ_APP_SEL_ANY;
}
-static int dcb_app_print_pid_dec(__u16 protocol)
+int dcb_app_print_pid_dec(__u16 protocol)
{
return print_uint(PRINT_ANY, NULL, "%u", protocol);
}
@@ -421,7 +420,7 @@ static int dcb_app_print_pid_hex(__u16 protocol)
return print_uint(PRINT_ANY, NULL, "%x", protocol);
}
-static int dcb_app_print_pid_dscp(__u16 protocol)
+int dcb_app_print_pid_dscp(__u16 protocol)
{
const char *name = rtnl_dsfield_get_name(protocol << 2);
@@ -430,7 +429,7 @@ static int dcb_app_print_pid_dscp(__u16 protocol)
return print_uint(PRINT_ANY, NULL, "%u", protocol);
}
-static int dcb_app_print_pid_pcp(__u16 protocol)
+int dcb_app_print_pid_pcp(__u16 protocol)
{
/* Print in numerical form, if protocol value is out-of-range */
if (protocol > DCB_APP_PCP_MAX)
@@ -439,13 +438,13 @@ static int dcb_app_print_pid_pcp(__u16 protocol)
return print_string(PRINT_ANY, NULL, "%s", pcp_names[protocol]);
}
-static void dcb_app_print_filtered(const struct dcb_app_table *tab,
- bool (*filter)(const struct dcb_app *),
- void (*print_pid_prio)(int (*print_pid)(__u16),
- const struct dcb_app *),
- int (*print_pid)(__u16 protocol),
- const char *json_name,
- const char *fp_name)
+void dcb_app_print_filtered(const struct dcb_app_table *tab,
+ bool (*filter)(const struct dcb_app *),
+ void (*print_pid_prio)(int (*print_pid)(__u16),
+ const struct dcb_app *),
+ int (*print_pid)(__u16 protocol),
+ const char *json_name,
+ const char *fp_name)
{
bool first = true;
size_t i;
@@ -600,7 +599,7 @@ static int dcb_app_get_table_attr_cb(const struct nlattr *attr, void *data)
return MNL_CB_OK;
}
-static int dcb_app_get(struct dcb *dcb, const char *dev, struct dcb_app_table *tab)
+int dcb_app_get(struct dcb *dcb, const char *dev, struct dcb_app_table *tab)
{
uint16_t payload_len;
void *payload;
@@ -643,9 +642,9 @@ static int dcb_app_add_del_cb(struct dcb *dcb, struct nlmsghdr *nlh, void *data)
return 0;
}
-static int dcb_app_add_del(struct dcb *dcb, const char *dev, int command,
- const struct dcb_app_table *tab,
- bool (*filter)(const struct dcb_app *))
+int dcb_app_add_del(struct dcb *dcb, const char *dev, int command,
+ const struct dcb_app_table *tab,
+ bool (*filter)(const struct dcb_app *))
{
struct dcb_app_add_del add_del = {
.tab = tab,
new file mode 100644
@@ -0,0 +1,355 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include <errno.h>
+#include <linux/dcbnl.h>
+#include <stdio.h>
+
+#include "dcb.h"
+#include "utils.h"
+
+static void dcb_rewr_help_add(void)
+{
+ fprintf(stderr,
+ "Usage: dcb rewr { add | del | replace } dev STRING\n"
+ " [ prio-pcp PRIO:PCP ]\n"
+ " [ prio-dscp PRIO:DSCP ]\n"
+ "\n"
+ " where PRIO := { 0 .. 7 }\n"
+ " PCP := { 0(nd/de) .. 7(nd/de) }\n"
+ " DSCP := { 0 .. 63 }\n"
+ "\n"
+ );
+}
+
+static void dcb_rewr_help_show_flush(void)
+{
+ fprintf(stderr,
+ "Usage: dcb rewr { show | flush } dev STRING\n"
+ " [ prio-pcp ]\n"
+ " [ prio-dscp ]\n"
+ "\n"
+ );
+}
+
+static void dcb_rewr_help(void)
+{
+ fprintf(stderr,
+ "Usage: dcb rewr help\n"
+ "\n"
+ );
+ dcb_rewr_help_show_flush();
+ dcb_rewr_help_add();
+}
+
+static int dcb_rewr_parse_mapping_prio_pcp(__u32 key, char *value, void *data)
+{
+ __u32 pcp;
+
+ if (dcb_app_parse_pcp(&pcp, value))
+ return -EINVAL;
+
+ return dcb_parse_mapping("PRIO", key, IEEE_8021QAZ_MAX_TCS - 1,
+ "PCP", pcp, DCB_APP_PCP_MAX,
+ dcb_app_parse_mapping_cb, data);
+}
+
+static int dcb_rewr_parse_mapping_prio_dscp(__u32 key, char *value, void *data)
+{
+ __u32 dscp;
+
+ if (dcb_app_parse_dscp(&dscp, value))
+ return -EINVAL;
+
+ return dcb_parse_mapping("PRIO", key, IEEE_8021QAZ_MAX_TCS - 1,
+ "DSCP", dscp, DCB_APP_DSCP_MAX,
+ dcb_app_parse_mapping_cb, data);
+}
+
+static void dcb_rewr_print_prio_pid(int (*print_pid)(__u16 protocol),
+ const struct dcb_app *app)
+{
+ print_uint(PRINT_ANY, NULL, "%u:", app->priority);
+ print_pid(app->protocol);
+}
+
+static void dcb_rewr_print_prio_pcp(const struct dcb *dcb,
+ const struct dcb_app_table *tab)
+{
+ dcb_app_print_filtered(tab, dcb_app_is_pcp,
+ dcb_rewr_print_prio_pid,
+ dcb->numeric ? dcb_app_print_pid_dec :
+ dcb_app_print_pid_pcp,
+ "prio_pcp", "prio-pcp");
+}
+
+static void dcb_rewr_print_prio_dscp(const struct dcb *dcb,
+ const struct dcb_app_table *tab)
+{
+ dcb_app_print_filtered(tab, dcb_app_is_dscp,
+ dcb_rewr_print_prio_pid,
+ dcb->numeric ? dcb_app_print_pid_dec :
+ dcb_app_print_pid_dscp,
+ "prio_dscp", "prio-dscp");
+}
+
+static void dcb_rewr_print(const struct dcb *dcb,
+ const struct dcb_app_table *tab)
+{
+ dcb_rewr_print_prio_pcp(dcb, tab);
+ dcb_rewr_print_prio_dscp(dcb, tab);
+}
+
+static int dcb_rewr_push(struct dcb_app_table *tab,
+ __u8 selector, __u32 key, __u64 value)
+{
+ struct dcb_app app = {
+ .selector = selector,
+ .priority = key,
+ .protocol = value,
+ };
+ return dcb_app_table_push(tab, &app);
+}
+
+static int dcb_cmd_rewr_parse_add_del(struct dcb *dcb, const char *dev,
+ int argc, char **argv,
+ struct dcb_app_table *tab)
+{
+ struct dcb_app_parse_mapping pm = {
+ .tab = tab,
+ .push = dcb_rewr_push,
+ };
+ int ret;
+
+ if (!argc) {
+ dcb_rewr_help_add();
+ return 0;
+ }
+
+ do {
+ if (strcmp(*argv, "help") == 0) {
+ dcb_rewr_help_add();
+ return 0;
+ } else if (strcmp(*argv, "prio-pcp") == 0) {
+ NEXT_ARG();
+ pm.selector = DCB_APP_SEL_PCP;
+ ret = parse_mapping(&argc, &argv, false,
+ &dcb_rewr_parse_mapping_prio_pcp,
+ &pm);
+ } else if (strcmp(*argv, "prio-dscp") == 0) {
+ NEXT_ARG();
+ pm.selector = IEEE_8021QAZ_APP_SEL_DSCP;
+ ret = parse_mapping(&argc, &argv, false,
+ &dcb_rewr_parse_mapping_prio_dscp,
+ &pm);
+ } else {
+ fprintf(stderr, "What is \"%s\"?\n", *argv);
+ dcb_rewr_help_add();
+ return -EINVAL;
+ }
+
+ if (ret != 0) {
+ fprintf(stderr, "Invalid mapping %s\n", *argv);
+ return ret;
+ }
+ if (pm.err)
+ return pm.err;
+ } while (argc > 0);
+
+ return 0;
+}
+
+static int dcb_cmd_rewr_add(struct dcb *dcb, const char *dev, int argc,
+ char **argv)
+{
+ struct dcb_app_table tab = { .attr = DCB_ATTR_DCB_REWR_TABLE };
+ int ret;
+
+ ret = dcb_cmd_rewr_parse_add_del(dcb, dev, argc, argv, &tab);
+ if (ret != 0)
+ return ret;
+
+ ret = dcb_app_add_del(dcb, dev, DCB_CMD_IEEE_SET, &tab, NULL);
+ dcb_app_table_fini(&tab);
+ return ret;
+}
+
+static int dcb_cmd_rewr_del(struct dcb *dcb, const char *dev, int argc,
+ char **argv)
+{
+ struct dcb_app_table tab = { .attr = DCB_ATTR_DCB_REWR_TABLE };
+ int ret;
+
+ ret = dcb_cmd_rewr_parse_add_del(dcb, dev, argc, argv, &tab);
+ if (ret != 0)
+ return ret;
+
+ ret = dcb_app_add_del(dcb, dev, DCB_CMD_IEEE_DEL, &tab, NULL);
+ dcb_app_table_fini(&tab);
+ return ret;
+}
+
+static int dcb_cmd_rewr_replace(struct dcb *dcb, const char *dev, int argc,
+ char **argv)
+{
+ struct dcb_app_table orig = { .attr = DCB_ATTR_DCB_REWR_TABLE };
+ struct dcb_app_table tab = { .attr = DCB_ATTR_DCB_REWR_TABLE };
+ struct dcb_app_table new = { .attr = DCB_ATTR_DCB_REWR_TABLE };
+ int ret;
+
+ ret = dcb_app_get(dcb, dev, &orig);
+ if (ret != 0)
+ return ret;
+
+ ret = dcb_cmd_rewr_parse_add_del(dcb, dev, argc, argv, &tab);
+ if (ret != 0)
+ goto out;
+
+ /* Attempts to add an existing entry would be rejected, so drop
+ * these entries from tab.
+ */
+ ret = dcb_app_table_copy(&new, &tab);
+ if (ret != 0)
+ goto out;
+ dcb_app_table_remove_existing(&new, &orig);
+
+ ret = dcb_app_add_del(dcb, dev, DCB_CMD_IEEE_SET, &new, NULL);
+ if (ret != 0) {
+ fprintf(stderr, "Could not add new rewrite entries\n");
+ goto out;
+ }
+
+ /* Remove the obsolete entries. */
+ dcb_app_table_remove_replaced(&orig, &tab, dcb_app_prio_eq);
+ ret = dcb_app_add_del(dcb, dev, DCB_CMD_IEEE_DEL, &orig, NULL);
+ if (ret != 0) {
+ fprintf(stderr, "Could not remove replaced rewrite entries\n");
+ goto out;
+ }
+
+out:
+ dcb_app_table_fini(&new);
+ dcb_app_table_fini(&tab);
+ dcb_app_table_fini(&orig);
+ return 0;
+}
+
+
+static int dcb_cmd_rewr_show(struct dcb *dcb, const char *dev, int argc,
+ char **argv)
+{
+ struct dcb_app_table tab = { .attr = DCB_ATTR_DCB_REWR_TABLE };
+ int ret;
+
+ ret = dcb_app_get(dcb, dev, &tab);
+ if (ret != 0)
+ return ret;
+
+ dcb_app_table_sort(&tab);
+
+ open_json_object(NULL);
+
+ if (!argc) {
+ dcb_rewr_print(dcb, &tab);
+ goto out;
+ }
+
+ do {
+ if (strcmp(*argv, "help") == 0) {
+ dcb_rewr_help_show_flush();
+ goto out;
+ } else if (strcmp(*argv, "prio-pcp") == 0) {
+ dcb_rewr_print_prio_pcp(dcb, &tab);
+ } else if (strcmp(*argv, "prio-dscp") == 0) {
+ dcb_rewr_print_prio_dscp(dcb, &tab);
+ } else {
+ fprintf(stderr, "What is \"%s\"?\n", *argv);
+ dcb_rewr_help_show_flush();
+ ret = -EINVAL;
+ goto out;
+ }
+
+ NEXT_ARG_FWD();
+ } while (argc > 0);
+
+out:
+ close_json_object();
+ dcb_app_table_fini(&tab);
+ return ret;
+}
+
+static int dcb_cmd_rewr_flush(struct dcb *dcb, const char *dev, int argc,
+ char **argv)
+{
+ struct dcb_app_table tab = { .attr = DCB_ATTR_DCB_REWR_TABLE };
+ int ret;
+
+ ret = dcb_app_get(dcb, dev, &tab);
+ if (ret != 0)
+ return ret;
+
+ if (!argc) {
+ ret = dcb_app_add_del(dcb, dev, DCB_CMD_IEEE_DEL, &tab,
+ NULL);
+ goto out;
+ }
+
+ do {
+ if (strcmp(*argv, "help") == 0) {
+ dcb_rewr_help_show_flush();
+ goto out;
+ } else if (strcmp(*argv, "prio-pcp") == 0) {
+ ret = dcb_app_add_del(dcb, dev, DCB_CMD_IEEE_DEL, &tab,
+ &dcb_app_is_pcp);
+ if (ret != 0)
+ goto out;
+ } else if (strcmp(*argv, "prio-dscp") == 0) {
+ ret = dcb_app_add_del(dcb, dev, DCB_CMD_IEEE_DEL, &tab,
+ &dcb_app_is_dscp);
+ if (ret != 0)
+ goto out;
+ } else {
+ fprintf(stderr, "What is \"%s\"?\n", *argv);
+ dcb_rewr_help_show_flush();
+ ret = -EINVAL;
+ goto out;
+ }
+
+ NEXT_ARG_FWD();
+ } while (argc > 0);
+
+out:
+ dcb_app_table_fini(&tab);
+ return ret;
+}
+
+int dcb_cmd_rewr(struct dcb *dcb, int argc, char **argv)
+{
+ if (!argc || strcmp(*argv, "help") == 0) {
+ dcb_rewr_help();
+ return 0;
+ } else if (strcmp(*argv, "show") == 0) {
+ NEXT_ARG_FWD();
+ return dcb_cmd_parse_dev(dcb, argc, argv, dcb_cmd_rewr_show,
+ dcb_rewr_help_show_flush);
+ } else if (strcmp(*argv, "flush") == 0) {
+ NEXT_ARG_FWD();
+ return dcb_cmd_parse_dev(dcb, argc, argv, dcb_cmd_rewr_flush,
+ dcb_rewr_help_show_flush);
+ } else if (strcmp(*argv, "add") == 0) {
+ NEXT_ARG_FWD();
+ return dcb_cmd_parse_dev(dcb, argc, argv, dcb_cmd_rewr_add,
+ dcb_rewr_help_add);
+ } else if (strcmp(*argv, "del") == 0) {
+ NEXT_ARG_FWD();
+ return dcb_cmd_parse_dev(dcb, argc, argv, dcb_cmd_rewr_del,
+ dcb_rewr_help_add);
+ } else if (strcmp(*argv, "replace") == 0) {
+ NEXT_ARG_FWD();
+ return dcb_cmd_parse_dev(dcb, argc, argv, dcb_cmd_rewr_replace,
+ dcb_rewr_help_add);
+ } else {
+ fprintf(stderr, "What is \"%s\"?\n", *argv);
+ dcb_rewr_help();
+ return -EINVAL;
+ }
+}
Add a new subcommand 'rewr' for configuring the in-kernel DCB rewrite table. The rewr-table of the kernel is similar to the APP-table, and so is this new subcommand. Therefore, much of the existing bookkeeping code from dcb-app, can be reused in the dcb-rewr implementation. Initially, only support for configuring PCP and DSCP-based rewrite has been added. Signed-off-by: Daniel Machon <daniel.machon@microchip.com> --- dcb/Makefile | 3 +- dcb/dcb.c | 4 +- dcb/dcb.h | 32 ++++++ dcb/dcb_app.c | 49 ++++---- dcb/dcb_rewr.c | 355 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 416 insertions(+), 27 deletions(-)