Skip to contentSkip to conversation

add batch command support to devlink

PATCH Applied Ivan Vecera 4 participants 13 messages Nov 10, 2017 – Nov 13, 2017

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

cover add batch command support to devlink

This patch series adds support for devlink commands batching. The first just removes a requirement to have declared 'resolve_hosts' variable in any command that use any function implemented in utils.c (it is really confusing to see this declaration in utils like bridge or devlink).

Ivan Vecera (2):
lib: make resolve_hosts variable common
devlink: add batch command support

 bridge/bridge.c    |  1 -
 devlink/devlink.c  | 70 +++++++++++++++++++++++++++++++++++++++++++++++-------
 genl/genl.c        |  1 -
 ip/ip.c            |  1 -
 ip/rtmon.c         |  1 -
 lib/utils.c        |  1 +
 man/man8/devlink.8 | 16 +++++++++++++
 misc/arpd.c        |  2 --
 misc/ss.c          |  1 -
 tc/tc.c            |  1 -
 10 files changed, 79 insertions(+), 16 deletions(-)
Signature · 1 line
2.13.6
#1 lore raw

PATCH 1/2 lib: make resolve_hosts variable common

Any iproute utility that uses any function from lib/utils.c needs to declare its own resolve_hosts variable instance although it does not need/use hostname resolving functionality (currently only 'ip' and 'ss' commands uses this).
The patch declares single common instance of resolve_hosts directly in utils.c so the existing ones can be removed (the same approach that is used for timestamp_short).

Cc Jiri Pirko <[email protected]>
Cc Arkadi Sharshevsky <[email protected]>
---
 bridge/bridge.c | 1 -
 genl/genl.c     | 1 -
 ip/ip.c         | 1 -
 ip/rtmon.c      | 1 -
 lib/utils.c     | 1 +
 misc/arpd.c     | 2 --
 misc/ss.c       | 1 -
 tc/tc.c         | 1 -
 8 files changed, 1 insertion(+), 8 deletions(-)
bridge/bridge.c +0 -1
index 5ff038d6..6658cb8f 100644
@@ -18,7 +18,6 @@
 
 struct rtnl_handle rth = { .fd = -1 };
 int preferred_family = AF_UNSPEC;
-int resolve_hosts;
 int oneline;
 int show_stats;
 int show_details;
genl/genl.c +0 -1
index 747074b0..7e4a208d 100644
@@ -30,7 +30,6 @@
 int show_stats = 0;
 int show_details = 0;
 int show_raw = 0;
-int resolve_hosts = 0;
 
 static void *BODY;
 static struct genl_util * genl_list;
ip/ip.c +0 -1
index e66f6970..e2da46dd 100644
@@ -30,7 +30,6 @@ int human_readable;
 int use_iec;
 int show_stats;
 int show_details;
-int resolve_hosts;
 int oneline;
 int brief;
 int json;
ip/rtmon.c +0 -1
index 1c2981f7..94baa38e 100644
@@ -25,7 +25,6 @@
 #include "utils.h"
 #include "libnetlink.h"
 
-int resolve_hosts;
 static int init_phase = 1;
 
 static void write_stamp(FILE *fp)
lib/utils.c +1 -0
index ac155bf5..f77be1fd 100644
@@ -37,6 +37,7 @@
 #include "utils.h"
 #include "namespace.h"
 
+int resolve_hosts;
 int timestamp_short;
 
 int get_hex(char c)
misc/arpd.c +0 -2
index c2666f76..67d86b67 100644
@@ -38,8 +38,6 @@
 #include "utils.h"
 #include "rt_names.h"
 
-int resolve_hosts;
-
 DB	*dbase;
 char	*dbname = "/var/lib/arpd/arpd.db";
 
misc/ss.c +0 -1
index 56a9ad41..45a0c330 100644
@@ -88,7 +88,6 @@ static int security_get_initial_context(char *name,  char **context)
 }
 #endif
 
-int resolve_hosts;
 int resolve_services = 1;
 int preferred_family = AF_UNSPEC;
 int show_options;
tc/tc.c +0 -1
index 8e64a82b..32924164 100644
@@ -39,7 +39,6 @@ int show_graph;
 int timestamp;
 
 int batch_mode;
-int resolve_hosts;
 int use_iec;
 int force;
 bool use_names;
Signature · 1 line
2.13.6
#2 lore raw

PATCH 2/2 devlink: add batch command support

In reply to Ivan Vecera

The patch adds support to batch devlink commands.

Cc Jiri Pirko <[email protected]>
Cc Arkadi Sharshevsky <[email protected]>
---
 devlink/devlink.c  | 70 +++++++++++++++++++++++++++++++++++++++++++++++-------
 man/man8/devlink.8 | 16 +++++++++++++
 2 files changed, 78 insertions(+), 8 deletions(-)
devlink/devlink.c +62 -8
index 39cda067..1b15eef8 100644
@@ -3803,12 +3803,16 @@ static int cmd_dpipe(struct dl *dl)
 static void help(void)
 {
 	pr_err("Usage: devlink [ OPTIONS ] OBJECT { COMMAND | help }\n"
+	       "       devlink [ -f[orce] ] -b[atch] filename\n"
 	       "where  OBJECT := { dev | port | sb | monitor | dpipe }\n"
 	       "       OPTIONS := { -V[ersion] | -n[no-nice-names] | -j[json] | -p[pretty] | -v[verbose] }\n");
 }
 
-static int dl_cmd(struct dl *dl)
+static int dl_cmd(struct dl *dl, int argc, char **argv)
 {
+	dl->argc = argc;
+	dl->argv = argv;
+
 	if (dl_argv_match(dl, "help") || dl_no_arg(dl)) {
 		help();
 		return 0;
@@ -3832,13 +3836,10 @@ static int dl_cmd(struct dl *dl)
 	return -ENOENT;
 }
 
-static int dl_init(struct dl *dl, int argc, char **argv)
+static int dl_init(struct dl *dl)
 {
 	int err;
 
-	dl->argc = argc;
-	dl->argv = argv;
-
 	dl->nlg = mnlg_socket_open(DEVLINK_GENL_NAME, DEVLINK_GENL_VERSION);
 	if (!dl->nlg) {
 		pr_err("Failed to connect to devlink Netlink\n");
@@ -3890,16 +3891,59 @@ static void dl_free(struct dl *dl)
 	free(dl);
 }
 
+static int dl_batch(struct dl *dl, const char *name, bool force)
+{
+	char *line = NULL;
+	size_t len = 0;
+	int ret = EXIT_SUCCESS;
+
+	if (name && strcmp(name, "-") != 0) {
+		if (freopen(name, "r", stdin) == NULL) {
+			fprintf(stderr,
+				"Cannot open file \"%s\" for reading: %s\n",
+				name, strerror(errno));
+			return EXIT_FAILURE;
+		}
+	}
+
+	cmdlineno = 0;
+	while (getcmdline(&line, &len, stdin) != -1) {
+		char *largv[100];
+		int largc;
+
+		largc = makeargs(line, largv, 100);
+		if (!largc)
+			continue;	/* blank line */
+
+		if (dl_cmd(dl, largc, largv)) {
+			fprintf(stderr, "Command failed %s:%d\n",
+				name, cmdlineno);
+			ret = EXIT_FAILURE;
+			if (!force)
+				break;
+		}
+	}
+
+	if (line)
+		free(line);
+
+	return ret;
+}
+
 int main(int argc, char **argv)
 {
 	static const struct option long_options[] = {
 		{ "Version",		no_argument,		NULL, 'V' },
+		{ "force",		no_argument,		NULL, 'f' },
+		{ "batch",		required_argument,	NULL, 'b' },
 		{ "no-nice-names",	no_argument,		NULL, 'n' },
 		{ "json",		no_argument,		NULL, 'j' },
 		{ "pretty",		no_argument,		NULL, 'p' },
 		{ "verbose",		no_argument,		NULL, 'v' },
 		{ NULL, 0, NULL, 0 }
 	};
+	const char *batch_file = NULL;
+	bool force = false;
 	struct dl *dl;
 	int opt;
 	int err;
@@ -3911,7 +3955,7 @@ int main(int argc, char **argv)
 		return EXIT_FAILURE;
 	}
 
-	while ((opt = getopt_long(argc, argv, "Vnjpv",
+	while ((opt = getopt_long(argc, argv, "Vfb:njpv",
 				  long_options, NULL)) >= 0) {
 
 		switch (opt) {
@@ -3919,6 +3963,12 @@ int main(int argc, char **argv)
 			printf("devlink utility, iproute2-ss%s\n", SNAPSHOT);
 			ret = EXIT_SUCCESS;
 			goto dl_free;
+		case 'f':
+			force = true;
+			break;
+		case 'b':
+			batch_file = optarg;
+			break;
 		case 'n':
 			dl->no_nice_names = true;
 			break;
@@ -3942,13 +3992,17 @@ int main(int argc, char **argv)
 	argc -= optind;
 	argv += optind;
 
-	err = dl_init(dl, argc, argv);
+	err = dl_init(dl);
 	if (err) {
 		ret = EXIT_FAILURE;
 		goto dl_free;
 	}
 
-	err = dl_cmd(dl);
+	if (batch_file)
+		err = dl_batch(dl, batch_file, force);
+	else
+		err = dl_cmd(dl, argc, argv);
+
 	if (err) {
 		ret = EXIT_FAILURE;
 		goto dl_fini;
man/man8/devlink.8 +16 -0
index a480766c..a975ef34 100644
@@ -12,6 +12,12 @@ devlink \- Devlink tool
 .sp
 
 .ti -8
+.B devlink
+.RB "[ " -force " ] "
+.BI "-batch " filename
+.sp
+
+.ti -8
 .IR OBJECT " := { "
 .BR dev " | " port " | " monitor " }"
 .sp
@@ -32,6 +38,16 @@ Print the version of the
 utility and exit.
 
 .TP
+.BR "\-b", " \-batch " <FILENAME>
+Read commands from provided file or standard input and invoke them.
+First failure will cause termination of devlink.
+
+.TP
+.BR "\-force"
+Don't terminate devlink on errors in batch mode.
+If there were any errors during execution of the commands, the application return code will be non zero.
+
+.TP
 .BR "\-n" , " --no-nice-names"
 Turn off printing out nice names, for example netdevice ifnames instead of devlink port identification.
 
Signature · 1 line
2.13.6
#3 lore raw

Re: [PATCH iproute2 2/2] devlink: add batch command support

Quoted 10 lines · Ivan Vecera

The patch adds support to batch devlink commands.

Cc Jiri Pirko <[email protected]>
Cc Arkadi Sharshevsky <[email protected]>
---
 devlink/devlink.c  | 70 +++++++++++++++++++++++++++++++++++++++++++++++-------
 man/man8/devlink.8 | 16 +++++++++++++
 2 files changed, 78 insertions(+), 8 deletions(-)

<..>

Quoted 18 lines
man/man8/devlink.8 +6 -0
index a480766c..a975ef34 100644
@@ -12,6 +12,12 @@ devlink \- Devlink tool
 .sp
 
 .ti -8
+.B devlink
+.RB "[ " -force " ] "
+.BI "-batch " filename
+.sp
+
+.ti -8
 .IR OBJECT " := { "
 .BR dev " | " port " | " monitor " }"
 .sp

man/man8/devlink.8 Print the version of the · line 43

Quoted 6 lines
man/man8/devlink.8 +3 -0
@@ -32,6 +38,16 @@ Print the version of the
 utility and exit.
 
 .TP
+.BR "\-b", " \-batch " <FILENAME>
+Read commands from provided file or standard input and invoke them.
+First failure will cause termination of devlink.

It is worth to document the expected format of that file. And IMHO, it is better to have ability to load JSON fie which was generated by -j, instead of declaring new format/knob.

Quoted 13 lines
man/man8/devlink.8 +7 -1
+
+.TP
+.BR "\-force"
+Don't terminate devlink on errors in batch mode.
+If there were any errors during execution of the commands, the application return code will be non zero.
+
+.TP
 .BR "\-n" , " --no-nice-names"
 Turn off printing out nice names, for example netdevice ifnames instead of devlink port identification.
 
--

2.13.6

#4 lore raw

Re: [PATCH iproute2 2/2] devlink: add batch command support

Quoted 34 lines · Leon Romanovsky
Quoted 10 lines · Ivan Vecera

The patch adds support to batch devlink commands.

Cc Jiri Pirko <[email protected]>
Cc Arkadi Sharshevsky <[email protected]>
---
 devlink/devlink.c  | 70 +++++++++++++++++++++++++++++++++++++++++++++++-------
 man/man8/devlink.8 | 16 +++++++++++++
 2 files changed, 78 insertions(+), 8 deletions(-)

<..>

Quoted 20 lines
man/man8/devlink.8 +6 -0
index a480766c..a975ef34 100644
@@ -12,6 +12,12 @@ devlink \- Devlink tool
 .sp
 
 .ti -8
+.B devlink
+.RB "[ " -force " ] "
+.BI "-batch " filename
+.sp
+
+.ti -8
 .IR OBJECT " := { "
 .BR dev " | " port " | " monitor " }"
 .sp
@@ -32,6 +38,16 @@ Print the version of the
 utility and exit.
 
Quoted 8 lines

man/man8/devlink.8 Print the version of the · line 43

Quoted 4 lines
man/man8/devlink.8 +3 -0
 .TP
+.BR "\-b", " \-batch " <FILENAME>
+Read commands from provided file or standard input and invoke them.
+First failure will cause termination of devlink.

It is worth to document the expected format of that file. And IMHO, it is better to have ability to load JSON fie which was generated by -j, instead of declaring new format/knob.

It's just a list of command-lines... like other utils (bridge,ip...)

I.

#5 lore raw

Re: [PATCH iproute2 2/2] devlink: add batch command support

Quoted 43 lines · Ivan Vecera
Quoted 34 lines · Leon Romanovsky
Quoted 10 lines · Ivan Vecera

The patch adds support to batch devlink commands.

Cc Jiri Pirko <[email protected]>
Cc Arkadi Sharshevsky <[email protected]>
---
 devlink/devlink.c  | 70 +++++++++++++++++++++++++++++++++++++++++++++++-------
 man/man8/devlink.8 | 16 +++++++++++++
 2 files changed, 78 insertions(+), 8 deletions(-)

<..>

Quoted 20 lines
man/man8/devlink.8 +6 -0
index a480766c..a975ef34 100644
@@ -12,6 +12,12 @@ devlink \- Devlink tool
 .sp
 
 .ti -8
+.B devlink
+.RB "[ " -force " ] "
+.BI "-batch " filename
+.sp
+
+.ti -8
 .IR OBJECT " := { "
 .BR dev " | " port " | " monitor " }"
 .sp
@@ -32,6 +38,16 @@ Print the version of the
 utility and exit.
 
Quoted 8 lines

man/man8/devlink.8 Print the version of the · line 43

Quoted 4 lines
man/man8/devlink.8 +3 -0
 .TP
+.BR "\-b", " \-batch " <FILENAME>
+Read commands from provided file or standard input and invoke them.
+First failure will cause termination of devlink.

It is worth to document the expected format of that file. And IMHO, it is better to have ability to load JSON fie which was generated by -j, instead of declaring new format/knob.

Quoted 1 line

It's just a list of command-lines... like other utils (bridge,ip...)

I'm implementing similar thing in RDMAtool (part of iproute2) and choose JSON approach, it is more user and script friendly.

Thanks

Quoted 3 lines

I.

#6 lore raw

Re: [PATCH iproute2 2/2] devlink: add batch command support

Quoted 44 lines · Fri, Nov 10, 2017 at 08:47:35PM CET, [email protected] wrote:
Quoted 43 lines · Ivan Vecera
Quoted 42 lines · Leon Romanovsky
Quoted 10 lines · Ivan Vecera

The patch adds support to batch devlink commands.

Cc Jiri Pirko <[email protected]>
Cc Arkadi Sharshevsky <[email protected]>
---
 devlink/devlink.c  | 70 +++++++++++++++++++++++++++++++++++++++++++++++-------
 man/man8/devlink.8 | 16 +++++++++++++
 2 files changed, 78 insertions(+), 8 deletions(-)

<..>

Quoted 18 lines
man/man8/devlink.8 +6 -0
index a480766c..a975ef34 100644
@@ -12,6 +12,12 @@ devlink \- Devlink tool
 .sp
 
 .ti -8
+.B devlink
+.RB "[ " -force " ] "
+.BI "-batch " filename
+.sp
+
+.ti -8
 .IR OBJECT " := { "
 .BR dev " | " port " | " monitor " }"
 .sp

man/man8/devlink.8 Print the version of the · line 43

Quoted 6 lines
man/man8/devlink.8 +3 -0
@@ -32,6 +38,16 @@ Print the version of the
 utility and exit.
 
 .TP
+.BR "\-b", " \-batch " <FILENAME>
+Read commands from provided file or standard input and invoke them.
+First failure will cause termination of devlink.

It is worth to document the expected format of that file. And IMHO, it is better to have ability to load JSON fie which was generated by -j, instead of declaring new format/knob.

Quoted 4 lines
Quoted 1 line

It's just a list of command-lines... like other utils (bridge,ip...)

I'm implementing similar thing in RDMAtool (part of iproute2) and choose JSON approach, it is more user and script friendly.

Leon, we should really do things in a way they are currently done and used. Batching is implemented in "ip" for a long time. It makes perfect sense to have one command line per line of the batch file.

In contrary, json output sounds really odd in this case. With json, there is no relation to ordinary ip command line params. Or do you want to extend it to accept json as well?

#7 lore raw

Re: [PATCH iproute2 2/2] devlink: add batch command support

Quoted 50 lines · Jiri Pirko
Quoted 44 lines · Fri, Nov 10, 2017 at 08:47:35PM CET, [email protected] wrote:
Quoted 43 lines · Ivan Vecera
Quoted 42 lines · Leon Romanovsky
Quoted 10 lines · Ivan Vecera

The patch adds support to batch devlink commands.

Cc Jiri Pirko <[email protected]>
Cc Arkadi Sharshevsky <[email protected]>
---
 devlink/devlink.c  | 70 +++++++++++++++++++++++++++++++++++++++++++++++-------
 man/man8/devlink.8 | 16 +++++++++++++
 2 files changed, 78 insertions(+), 8 deletions(-)

<..>

Quoted 18 lines
man/man8/devlink.8 +6 -0
index a480766c..a975ef34 100644
@@ -12,6 +12,12 @@ devlink \- Devlink tool
 .sp
 
 .ti -8
+.B devlink
+.RB "[ " -force " ] "
+.BI "-batch " filename
+.sp
+
+.ti -8
 .IR OBJECT " := { "
 .BR dev " | " port " | " monitor " }"
 .sp

man/man8/devlink.8 Print the version of the · line 43

Quoted 6 lines
man/man8/devlink.8 +3 -0
@@ -32,6 +38,16 @@ Print the version of the
 utility and exit.
 
 .TP
+.BR "\-b", " \-batch " <FILENAME>
+Read commands from provided file or standard input and invoke them.
+First failure will cause termination of devlink.

It is worth to document the expected format of that file. And IMHO, it is better to have ability to load JSON fie which was generated by -j, instead of declaring new format/knob.

Quoted 4 lines
Quoted 1 line

It's just a list of command-lines... like other utils (bridge,ip...)

I'm implementing similar thing in RDMAtool (part of iproute2) and choose JSON approach, it is more user and script friendly.

Quoted 7 lines

Leon, we should really do things in a way they are currently done and used. Batching is implemented in "ip" for a long time. It makes perfect sense to have one command line per line of the batch file.

In contrary, json output sounds really odd in this case. With json, there is no relation to ordinary ip command line params. Or do you want to extend it to accept json as well?

Yes, I wanted to add new field - "cmd", and whole logic to parse JSON to properly rebuild command from that with right parameters and device name.

However, most probably, I'll never finish it near future, so in meanwhile I will provide the same batch format as Ivan proposed.

Thanks

Quoted 1 line
#8 lore raw

Re: [PATCH iproute2 2/2] devlink: add batch command support

Quoted 59 lines · Sun, Nov 12, 2017 at 09:19:23AM CET, [email protected] wrote:
Quoted 50 lines · Jiri Pirko
Quoted 44 lines · Fri, Nov 10, 2017 at 08:47:35PM CET, [email protected] wrote:
Quoted 43 lines · Ivan Vecera
Quoted 42 lines · Leon Romanovsky
Quoted 10 lines · Ivan Vecera

The patch adds support to batch devlink commands.

Cc Jiri Pirko <[email protected]>
Cc Arkadi Sharshevsky <[email protected]>
---
 devlink/devlink.c  | 70 +++++++++++++++++++++++++++++++++++++++++++++++-------
 man/man8/devlink.8 | 16 +++++++++++++
 2 files changed, 78 insertions(+), 8 deletions(-)

<..>

Quoted 18 lines
man/man8/devlink.8 +6 -0
index a480766c..a975ef34 100644
@@ -12,6 +12,12 @@ devlink \- Devlink tool
 .sp
 
 .ti -8
+.B devlink
+.RB "[ " -force " ] "
+.BI "-batch " filename
+.sp
+
+.ti -8
 .IR OBJECT " := { "
 .BR dev " | " port " | " monitor " }"
 .sp

man/man8/devlink.8 Print the version of the · line 43

Quoted 6 lines
man/man8/devlink.8 +3 -0
@@ -32,6 +38,16 @@ Print the version of the
 utility and exit.
 
 .TP
+.BR "\-b", " \-batch " <FILENAME>
+Read commands from provided file or standard input and invoke them.
+First failure will cause termination of devlink.

It is worth to document the expected format of that file. And IMHO, it is better to have ability to load JSON fie which was generated by -j, instead of declaring new format/knob.

Quoted 4 lines
Quoted 1 line

It's just a list of command-lines... like other utils (bridge,ip...)

I'm implementing similar thing in RDMAtool (part of iproute2) and choose JSON approach, it is more user and script friendly.

Quoted 7 lines

Leon, we should really do things in a way they are currently done and used. Batching is implemented in "ip" for a long time. It makes perfect sense to have one command line per line of the batch file.

In contrary, json output sounds really odd in this case. With json, there is no relation to ordinary ip command line params. Or do you want to extend it to accept json as well?

Quoted 5 lines

Yes, I wanted to add new field - "cmd", and whole logic to parse JSON to properly rebuild command from that with right parameters and device name.

However, most probably, I'll never finish it near future, so in meanwhile I will provide the same batch format as Ivan proposed.

Good. I think it is more than enough for now :) Thanks!

Quoted 4 lines

Thanks

Quoted 1 line
#9 lore raw

Re: [PATCH iproute2 2/2] devlink: add batch command support

In reply to Leon Romanovsky
Quoted 44 lines · On Fri, 10 Nov 2017 21:47:35 +0200 Leon Romanovsky <[email protected]> wrote:
Quoted 43 lines · Ivan Vecera
Quoted 42 lines · Leon Romanovsky
Quoted 10 lines · Ivan Vecera

The patch adds support to batch devlink commands.

Cc Jiri Pirko <[email protected]>
Cc Arkadi Sharshevsky <[email protected]>
---
 devlink/devlink.c  | 70 +++++++++++++++++++++++++++++++++++++++++++++++-------
 man/man8/devlink.8 | 16 +++++++++++++
 2 files changed, 78 insertions(+), 8 deletions(-)

<..>

Quoted 18 lines
man/man8/devlink.8 +6 -0
index a480766c..a975ef34 100644
@@ -12,6 +12,12 @@ devlink \- Devlink tool
 .sp
 
 .ti -8
+.B devlink
+.RB "[ " -force " ] "
+.BI "-batch " filename
+.sp
+
+.ti -8
 .IR OBJECT " := { "
 .BR dev " | " port " | " monitor " }"
 .sp

man/man8/devlink.8 Print the version of the · line 43

Quoted 6 lines
man/man8/devlink.8 +3 -0
@@ -32,6 +38,16 @@ Print the version of the
 utility and exit.
 
 .TP
+.BR "\-b", " \-batch " <FILENAME>
+Read commands from provided file or standard input and invoke them.
+First failure will cause termination of devlink.  

It is worth to document the expected format of that file. And IMHO, it is better to have ability to load JSON fie which was generated by -j, instead of declaring new format/knob.

Quoted 5 lines
Quoted 1 line

It's just a list of command-lines... like other utils (bridge,ip...)

I'm implementing similar thing in RDMAtool (part of iproute2) and choose JSON approach, it is more user and script friendly.

If you want to do batch form rdmatool then it must take list of commands by default. An additional option to take json input "rdmatool -j --batch..." would be good as well.

#10 lore raw

Re: [PATCH iproute2 2/2] devlink: add batch command support

Quoted 47 lines · Stephen Hemminger
Quoted 44 lines · On Fri, 10 Nov 2017 21:47:35 +0200 Leon Romanovsky <[email protected]> wrote:
Quoted 43 lines · Ivan Vecera
Quoted 42 lines · Leon Romanovsky
Quoted 10 lines · Ivan Vecera

The patch adds support to batch devlink commands.

Cc Jiri Pirko <[email protected]>
Cc Arkadi Sharshevsky <[email protected]>
---
 devlink/devlink.c  | 70 +++++++++++++++++++++++++++++++++++++++++++++++-------
 man/man8/devlink.8 | 16 +++++++++++++
 2 files changed, 78 insertions(+), 8 deletions(-)

<..>

Quoted 18 lines
man/man8/devlink.8 +6 -0
index a480766c..a975ef34 100644
@@ -12,6 +12,12 @@ devlink \- Devlink tool
 .sp
 
 .ti -8
+.B devlink
+.RB "[ " -force " ] "
+.BI "-batch " filename
+.sp
+
+.ti -8
 .IR OBJECT " := { "
 .BR dev " | " port " | " monitor " }"
 .sp

man/man8/devlink.8 Print the version of the · line 43

Quoted 6 lines
man/man8/devlink.8 +3 -0
@@ -32,6 +38,16 @@ Print the version of the
 utility and exit.
 
 .TP
+.BR "\-b", " \-batch " <FILENAME>
+Read commands from provided file or standard input and invoke them.
+First failure will cause termination of devlink.

It is worth to document the expected format of that file. And IMHO, it is better to have ability to load JSON fie which was generated by -j, instead of declaring new format/knob.

Quoted 9 lines
Quoted 5 lines
Quoted 1 line

It's just a list of command-lines... like other utils (bridge,ip...)

I'm implementing similar thing in RDMAtool (part of iproute2) and choose JSON approach, it is more user and script friendly.

If you want to do batch form rdmatool then it must take list of commands by default. An additional option to take json input "rdmatool -j --batch..." would be good as well.

I'll do.

Thanks

Quoted 1 line
#12 lore raw
In reply to Ivan Vecera
Quoted 9 lines · On Fri, 10 Nov 2017 07:20:12 +0100 Ivan Vecera <[email protected]> wrote:

This patch series adds support for devlink commands batching. The first just removes a requirement to have declared 'resolve_hosts' variable in any command that use any function implemented in utils.c (it is really confusing to see this declaration in utils like bridge or devlink).

Ivan Vecera (2):
lib: make resolve_hosts variable common
devlink: add batch command support

Quoted 12 lines
 bridge/bridge.c    |  1 -
 devlink/devlink.c  | 70 +++++++++++++++++++++++++++++++++++++++++++++++-------
 genl/genl.c        |  1 -
 ip/ip.c            |  1 -
 ip/rtmon.c         |  1 -
 lib/utils.c        |  1 +
 man/man8/devlink.8 | 16 +++++++++++++
 misc/arpd.c        |  2 --
 misc/ss.c          |  1 -
 tc/tc.c            |  1 -
 10 files changed, 79 insertions(+), 16 deletions(-)

Applied