From: Daniel Machon <daniel.machon@microchip.com>
To: <netdev@vger.kernel.org>
Cc: <dsahern@kernel.org>, <stephen@networkplumber.org>,
<petrm@nvidia.com>, <UNGLinuxDriver@microchip.com>,
<daniel.machon@microchip.com>
Subject: [PATCH iproute2-next v3 07/12] dcb: app: expose functions required by dcb-rewr
Date: Tue, 6 Jun 2023 09:19:42 +0200 [thread overview]
Message-ID: <20230510-dcb-rewr-v3-7-60a766f72e61@microchip.com> (raw)
In-Reply-To: <20230510-dcb-rewr-v3-0-60a766f72e61@microchip.com>
In preparation for the dcb-rewr implementation, expose required
functions, and structs.
Signed-off-by: Daniel Machon <daniel.machon@microchip.com>
---
dcb/dcb.h | 49 ++++++++++++++++++++++++++++++++++++++++++++
dcb/dcb_app.c | 66 +++++++++++++++++++++++------------------------------------
2 files changed, 75 insertions(+), 40 deletions(-)
diff --git a/dcb/dcb.h b/dcb/dcb.h
index d40664f29dad..82ad72bc9ff3 100644
--- a/dcb/dcb.h
+++ b/dcb/dcb.h
@@ -56,11 +56,60 @@ void dcb_print_array_kw(const __u8 *array, size_t array_size,
/* dcb_app.c */
+struct dcb_app_table {
+ struct dcb_app *apps;
+ size_t n_apps;
+ int attr;
+};
+
+struct dcb_app_parse_mapping {
+ __u8 selector;
+ struct dcb_app_table *tab;
+ int err;
+};
+
+#define DCB_APP_PCP_MAX 15
+
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);
+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);
+
/* dcb_apptrust.c */
int dcb_cmd_apptrust(struct dcb *dcb, int argc, char **argv);
diff --git a/dcb/dcb_app.c b/dcb/dcb_app.c
index 4b309016fb65..9c2727eff7d8 100644
--- a/dcb/dcb_app.c
+++ b/dcb/dcb_app.c
@@ -10,8 +10,6 @@
#include "utils.h"
#include "rt_names.h"
-#define DCB_APP_PCP_MAX 15
-
static const char *const pcp_names[DCB_APP_PCP_MAX + 1] = {
"0nd", "1nd", "2nd", "3nd", "4nd", "5nd", "6nd", "7nd",
"0de", "1de", "2de", "3de", "4de", "5de", "6de", "7de"
@@ -68,12 +66,6 @@ static void dcb_app_help(void)
dcb_app_help_add();
}
-struct dcb_app_table {
- struct dcb_app *apps;
- size_t n_apps;
- int attr;
-};
-
enum ieee_attrs_app dcb_app_attr_type_get(__u8 selector)
{
switch (selector) {
@@ -106,12 +98,12 @@ 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);
}
-static int dcb_app_table_push(struct dcb_app_table *tab, struct dcb_app *app)
+int dcb_app_table_push(struct dcb_app_table *tab, struct dcb_app *app)
{
struct dcb_app *apps = realloc(tab->apps, (tab->n_apps + 1) * sizeof(*tab->apps));
@@ -125,8 +117,8 @@ static 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;
@@ -159,7 +151,7 @@ static bool dcb_app_pid_eq(const struct dcb_app *aa, const struct dcb_app *ab)
aa->protocol == ab->protocol;
}
-static void dcb_app_table_remove_replaced(struct dcb_app_table *a,
+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))
@@ -198,8 +190,8 @@ static 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,17 +218,11 @@ 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);
}
-struct dcb_app_parse_mapping {
- __u8 selector;
- struct dcb_app_table *tab;
- int err;
-};
-
static void dcb_app_parse_mapping_cb(__u32 key, __u64 value, void *data)
{
struct dcb_app_parse_mapping *pm = data;
@@ -269,7 +255,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 +281,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;
@@ -386,12 +372,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 +397,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 +407,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);
@@ -431,7 +417,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)
@@ -440,13 +426,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;
@@ -601,7 +587,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;
@@ -644,9 +630,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,
--
2.34.1
next prev parent reply other threads:[~2023-06-06 7:20 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-06 7:19 [PATCH iproute2-next v3 00/12] Introduce new dcb-rewr subcommand Daniel Machon
2023-06-06 7:19 ` [PATCH iproute2-next v3 01/12] dcb: app: add new dcbnl attribute field Daniel Machon
2023-06-06 15:00 ` Petr Machata
2023-06-06 7:19 ` [PATCH iproute2-next v3 02/12] dcb: app: replace occurrences of %d with %u for printing unsigned int Daniel Machon
2023-06-06 9:29 ` Petr Machata
2023-06-06 7:19 ` [PATCH iproute2-next v3 03/12] dcb: app: move colon printing out of callbacks Daniel Machon
2023-06-06 9:32 ` Petr Machata
2023-06-06 7:19 ` [PATCH iproute2-next v3 04/12] dcb: app: rename dcb_app_print_key_*() functions Daniel Machon
2023-06-06 9:34 ` Petr Machata
2023-06-06 7:19 ` [PATCH iproute2-next v3 05/12] dcb: app: modify dcb_app_print_filtered() for dcb-rewr reuse Daniel Machon
2023-06-06 14:08 ` Petr Machata
2023-06-06 7:19 ` [PATCH iproute2-next v3 06/12] dcb: app: modify dcb_app_table_remove_replaced() " Daniel Machon
2023-06-06 13:10 ` Petr Machata
2023-06-06 7:19 ` Daniel Machon [this message]
2023-06-06 13:11 ` [PATCH iproute2-next v3 07/12] dcb: app: expose functions required by dcb-rewr Petr Machata
2023-06-06 7:19 ` [PATCH iproute2-next v3 08/12] dcb: rewr: add new dcb-rewr subcommand Daniel Machon
2023-06-06 13:17 ` Petr Machata
2023-06-06 7:19 ` [PATCH iproute2-next v3 09/12] dcb: rewr: add symbol for max DSCP value Daniel Machon
2023-06-06 13:14 ` Petr Machata
2023-06-06 7:19 ` [PATCH iproute2-next v3 10/12] man: dcb-rewr: add new manpage for dcb-rewr Daniel Machon
2023-06-06 7:19 ` [PATCH iproute2-next v3 11/12] man: dcb: add additional references under 'SEE ALSO' Daniel Machon
2023-06-06 7:19 ` [PATCH iproute2-next v3 12/12] man: dcb-app: clean up a few mistakes Daniel Machon
2023-06-09 21:50 ` [PATCH iproute2-next v3 00/12] Introduce new dcb-rewr subcommand patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230510-dcb-rewr-v3-7-60a766f72e61@microchip.com \
--to=daniel.machon@microchip.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=dsahern@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=petrm@nvidia.com \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).