dcb: Fixes
Subsystems (2)
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.
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
PATCH 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.
--- dcb/dcb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
dcb/dcb.c +1 -1
@@ -177,7 +177,7 @@ int dcb_set_attribute(struct dcb *dcb, const char *dev, int attr, const void *dastruct 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
Re: [PATCH iproute2 1/3] dcb: Set values with RTM_SETDCB type
Quoted 13 lines · On Sat, 2 Jan 2021 00:25:50 +0100 Petr Machata <[email protected]> wrote:
dcb currently sends all netlink messages with a type
RTM_GETDCB, even the set ones. Change to the appropriate type.Signed-off-by Petr Machata <[email protected]>--- dcb/dcb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)dcb/dcb.c +0
-0
dcb/dcb.c int dcb_set_attribute(struct dcb *dcb, const char *dev, int attr, const void *da · line 183
Quoted 8 lines
dcb/dcb.c +1
-1@@ -177,7 +177,7 @@ int dcb_set_attribute(struct dcb *dcb, const char *dev, int attr, const void *dastruct 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);
Should I add fixes tag to this?
Re: [PATCH iproute2 1/3] dcb: Set values with RTM_SETDCB type
Quoted 19 lines · Stephen Hemminger
Quoted 16 lines · On Sat, 2 Jan 2021 00:25:50 +0100 Petr Machata <[email protected]> wrote:
dcb currently sends all netlink messages with a type
RTM_GETDCB, even the set ones. Change to the appropriate type.Signed-off-by Petr Machata <[email protected]>--- dcb/dcb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)dcb/dcb.c +0
-0@@ -177,7 +177,7 @@ int dcb_set_attribute(struct dcb *dcb, const char *dev, int attr, const void *dastruct nlattr *nest;int ret;
Quoted 7 lines
dcb/dcb.c int dcb_set_attribute(struct dcb *dcb, const char *dev, int attr, const void *da · line 183
Quoted 5 lines
dcb/dcb.c +1
-1- 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);Should I add fixes tag to this?
Ha, I forgot that Fixes: tags are a thing in iproute2. Sorry about that, I'll resend.
Re: [PATCH iproute2 1/3] dcb: Set values with RTM_SETDCB type
Quoted 24 lines · On Sun, 03 Jan 2021 11:47:46 +0100 Petr Machata <[email protected]> wrote:
Quoted 22 lines · Stephen Hemminger
Quoted 19 lines · On Sat, 2 Jan 2021 00:25:50 +0100 Petr Machata <[email protected]> wrote:
dcb currently sends all netlink messages with a type
RTM_GETDCB, even the set ones. Change to the appropriate type.Signed-off-by Petr Machata <[email protected]>--- dcb/dcb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)dcb/dcb.c +1
-1@@ -177,7 +177,7 @@ int dcb_set_attribute(struct dcb *dcb, const char *dev, int attr, const void *dastruct 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 );
Quoted 7 lines
Quoted 4 lines
dcb/dcb.c int dcb_set_attribute(struct dcb *dcb, const char *dev, int attr, const void *da · line 183
Quoted 2 lines
dcb/dcb.c +0
-0nest =mnl_attr_nest_start (nlh,DCB_ATTR_IEEE );mnl_attr_put (nlh, attr, data_len, data);Should I add fixes tag to this?
Ha, I forgot that Fixes: tags are a thing in iproute2. Sorry about that, I'll resend.
Thanks, Fixes are mainly to help out distribution maintainers who want to backport to older versions.
PATCH 2/3 dcb: Plug a leaking DCB socket buffer
In reply to Petr MachataDCB socket buffer is allocated in dcb_init(), but never freed(). Free it in dcb_fini().
--- dcb/dcb.c | 1 + 1 file changed, 1 insertion(+)
dcb/dcb.c +1 -0
@@ -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
PATCH 3/3 dcb: Change --Netns/-N to --netns/-n
In reply to Petr MachataThis to keep compatible with the major tools, ip and tc. Also document the option in the man page, which was neglected.
--- dcb/dcb.c | 8 ++++---- man/man8/dcb.8 | 7 +++++++ 2 files changed, 11 insertions(+), 4 deletions(-)
dcb/dcb.c +4 -4
@@ -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
@@ -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