Skip to contentSkip to conversation

dcb: Fixes

PATCH New Petr Machata 1 participant 4 messages Jan 3, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v2 cover dcb: Fixes

dcb currently sends all netlink messages with a type RTM_GETDCB, even the set ones. In patch #1, send the setters as RTM_SETDCB.

In patch #2, plug a leak.

In patch #3, change the command line option for namespace change from devlink-like -N / --Netns to ip-like -n / --netns.

v2:
- Patches #1-#3:
- Add Fixes: tag.

Petr Machata (3):
dcb: Set values with RTM_SETDCB type
dcb: Plug a leaking DCB socket buffer
dcb: Change --Netns/-N to --netns/-n

 dcb/dcb.c      | 11 ++++++-----
 man/man8/dcb.8 |  7 +++++++
 2 files changed, 13 insertions(+), 5 deletions(-)
Signature · 1 line
2.26.2
#1 lore raw

PATCH v2 1/3 dcb: Set values with RTM_SETDCB type

dcb currently sends all netlink messages with a type RTM_GETDCB, even the set ones. Change to the appropriate type.

Fixes 67033d1c1c8a ("Add skeleton of a new tool, dcb")

---

Notes:
v2:
- Add Fixes: tag.

 dcb/dcb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
dcb/dcb.c +1 -1
index adec57476e1d..f5c62790e27e 100644
@@ -177,7 +177,7 @@ int dcb_set_attribute(struct dcb *dcb, const char *dev, int attr, const void *da
 	struct nlattr *nest;
 	int ret;
 
-	nlh = dcb_prepare(dcb, dev, RTM_GETDCB, DCB_CMD_IEEE_SET);
+	nlh = dcb_prepare(dcb, dev, RTM_SETDCB, DCB_CMD_IEEE_SET);
 
 	nest = mnl_attr_nest_start(nlh, DCB_ATTR_IEEE);
 	mnl_attr_put(nlh, attr, data_len, data);
Signature · 1 line
2.26.2
#2 lore raw

PATCH v2 2/3 dcb: Plug a leaking DCB socket buffer

In reply to Petr Machata

DCB socket buffer is allocated in dcb_init(), but never freed(). Free it in dcb_fini().

Fixes 67033d1c1c8a ("Add skeleton of a new tool, dcb")

---

Notes:
v2:
- Add Fixes: tag.

 dcb/dcb.c | 1 +
 1 file changed, 1 insertion(+)
dcb/dcb.c +1 -0
index f5c62790e27e..0e3c87484f2a 100644
@@ -38,6 +38,7 @@ static void dcb_fini(struct dcb *dcb)
 {
 	delete_json_obj_plain();
 	mnl_socket_close(dcb->nl);
+	free(dcb->buf);
 }
 
 static struct dcb *dcb_alloc(void)
Signature · 1 line
2.26.2
#3 lore raw

PATCH v2 3/3 dcb: Change --Netns/-N to --netns/-n

In reply to Petr Machata

This to keep compatible with the major tools, ip and tc. Also document the option in the man page, which was neglected.

Fixes 67033d1c1c8a ("Add skeleton of a new tool, dcb")

---

Notes:
v2:
- Add Fixes: tag.

 dcb/dcb.c      | 8 ++++----
 man/man8/dcb.8 | 7 +++++++
 2 files changed, 11 insertions(+), 4 deletions(-)
dcb/dcb.c +4 -4
index 0e3c87484f2a..6640deef5688 100644
@@ -332,7 +332,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"
+		"       dcb [ -f | --force ] { -b | --batch } filename [ -n | --netns ] netnsname\n"
 		"where  OBJECT := { buffer | ets | maxrate | pfc }\n"
 		"       OPTIONS := [ -V | --Version | -i | --iec | -j | --json\n"
 		"                  | -p | --pretty | -s | --statistics | -v | --verbose]\n");
@@ -379,7 +379,7 @@ int main(int argc, char **argv)
 		{ "json",		no_argument,		NULL, 'j' },
 		{ "pretty",		no_argument,		NULL, 'p' },
 		{ "statistics",		no_argument,		NULL, 's' },
-		{ "Netns",		required_argument,	NULL, 'N' },
+		{ "netns",		required_argument,	NULL, 'n' },
 		{ "help",		no_argument,		NULL, 'h' },
 		{ NULL, 0, NULL, 0 }
 	};
@@ -396,7 +396,7 @@ int main(int argc, char **argv)
 		return EXIT_FAILURE;
 	}
 
-	while ((opt = getopt_long(argc, argv, "b:fhijpsvN:V",
+	while ((opt = getopt_long(argc, argv, "b:fhijn:psvV",
 				  long_options, NULL)) >= 0) {
 
 		switch (opt) {
@@ -419,7 +419,7 @@ int main(int argc, char **argv)
 		case 's':
 			dcb->stats = true;
 			break;
-		case 'N':
+		case 'n':
 			if (netns_switch(optarg)) {
 				ret = EXIT_FAILURE;
 				goto dcb_free;
man/man8/dcb.8 +7 -0
index 5964f25d386d..7293bb303577 100644
@@ -27,6 +27,13 @@ dcb \- show / manipulate DCB (Data Center Bridging) settings
 
 .SH OPTIONS
 
+.TP
+.BR "\-n" , " \--netns " <NETNS>
+switches
+.B dcb
+to the specified network namespace
+.IR NETNS .
+
 .TP
 .BR "\-V" , " --Version"
 Print the version of the
Signature · 1 line
2.26.2