svn commit: r354471 - in stable/12: share/man/man4 sys/dev/netmap sys/net tools/tools/netmap usr.sbin usr.sbin/valectl

Thu Nov 7 20:09:43 UTC 2019

Author: vmaffione
Date: Thu Nov  7 20:09:41 2019
New Revision: 354471
URL: https://svnweb.freebsd.org/changeset/base/354471

Log:
  MFC r354229
  
  add valectl to the system commands
  
  The valectl(4) program is used to manage vale(4) switches.
  Add it to the system commands so that it can be used right away.
  This program was previously called vale-ctl, and stored in
  tools/tools/netmap
  
  Reviewed by:    hrs, bcr, lwhsu, kevans
  Differential Revision:  https://reviews.freebsd.org/D22146

Added:
  stable/12/usr.sbin/valectl/
     - copied from r354229, head/usr.sbin/valectl/
Deleted:
  stable/12/tools/tools/netmap/vale-ctl.4
  stable/12/tools/tools/netmap/vale-ctl.c
Modified:
  stable/12/share/man/man4/netmap.4
  stable/12/sys/dev/netmap/netmap_bdg.c
  stable/12/sys/net/netmap_legacy.h
  stable/12/tools/tools/netmap/Makefile
  stable/12/tools/tools/netmap/README
  stable/12/tools/tools/netmap/lb.8
  stable/12/usr.sbin/Makefile
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/share/man/man4/netmap.4
==============================================================================

--- stable/12/share/man/man4/netmap.4	Thu Nov  7 19:54:24 2019	(r354470)
+++ stable/12/share/man/man4/netmap.4	Thu Nov  7 20:09:41 2019	(r354471)
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 20, 2018
+.Dd October 26, 2019
 .Dt NETMAP 4
 .Os
 .Sh NAME
@@ -1087,14 +1087,14 @@ changing port names, e.g.,
 .Pp
 The following command attaches an interface and the host stack
 to a switch:
-.Dl vale-ctl -h vale2:em0
+.Dl valectl -h vale2:em0
 Other
 .Nm
 clients attached to the same switch can now communicate
 with the network card or the host.
 .Sh SEE ALSO
 .Xr vale 4 ,
-.Xr vale-ctl 4 ,
+.Xr valectl 8 ,
 .Xr bridge 8 ,
 .Xr lb 8 ,
 .Xr nmreplay 8 ,

Modified: stable/12/sys/dev/netmap/netmap_bdg.c
==============================================================================
--- stable/12/sys/dev/netmap/netmap_bdg.c	Thu Nov  7 19:54:24 2019	(r354470)
+++ stable/12/sys/dev/netmap/netmap_bdg.c	Thu Nov  7 20:09:41 2019	(r354471)
@@ -1442,7 +1442,7 @@ put_out:
 
 
 /* nm_bdg_ctl callback for the bwrap.
- * Called on bridge-attach and detach, as an effect of vale-ctl -[ahd].
+ * Called on bridge-attach and detach, as an effect of valectl -[ahd].
  * On attach, it needs to provide a fake netmap_priv_d structure and
  * perform a netmap_do_regif() on the bwrap. This will put both the
  * bwrap and the hwna in netmap mode, with the netmap rings shared

Modified: stable/12/sys/net/netmap_legacy.h
==============================================================================
--- stable/12/sys/net/netmap_legacy.h	Thu Nov  7 19:54:24 2019	(r354470)
+++ stable/12/sys/net/netmap_legacy.h	Thu Nov  7 20:09:41 2019	(r354471)
@@ -116,13 +116,13 @@
  * nr_cmd (in)	if non-zero indicates a special command:
  *	NETMAP_BDG_ATTACH	 and nr_name = vale*:ifname
  *		attaches the NIC to the switch; nr_ringid specifies
- *		which rings to use. Used by vale-ctl -a ...
+ *		which rings to use. Used by valectl -a ...
  *	    nr_arg1 = NETMAP_BDG_HOST also attaches the host port
- *		as in vale-ctl -h ...
+ *		as in valectl -h ...
  *
  *	NETMAP_BDG_DETACH	and nr_name = vale*:ifname
  *		disconnects a previously attached NIC.
- *		Used by vale-ctl -d ...
+ *		Used by valectl -d ...
  *
  *	NETMAP_BDG_LIST
  *		list the configuration of VALE switches.
@@ -133,10 +133,10 @@
  *
  *	NETMAP_BDG_NEWIF
  *		create a persistent VALE port with name nr_name.
- *		Used by vale-ctl -n ...
+ *		Used by valectl -n ...
  *
  *	NETMAP_BDG_DELIF
- *		delete a persistent VALE port. Used by vale-ctl -d ...
+ *		delete a persistent VALE port. Used by valectl -d ...
  *
  * nr_arg1, nr_arg2, nr_arg3  (in/out)		command specific
  *

Modified: stable/12/tools/tools/netmap/Makefile
==============================================================================
--- stable/12/tools/tools/netmap/Makefile	Thu Nov  7 19:54:24 2019	(r354470)
+++ stable/12/tools/tools/netmap/Makefile	Thu Nov  7 20:09:41 2019	(r354471)
@@ -3,7 +3,7 @@
 #
 # For multiple programs using a single source file each,
 # we can just define 'progs' and create custom targets.
-PROGS	=	pkt-gen nmreplay bridge vale-ctl lb
+PROGS	=	pkt-gen nmreplay bridge lb
 
 CLEANFILES = $(PROGS) *.o
 MAN=
@@ -31,9 +31,6 @@ bridge: bridge.o
 
 nmreplay: nmreplay.o
 	$(CC) $(CFLAGS) -o nmreplay nmreplay.o $(LDFLAGS)
-
-vale-ctl: vale-ctl.o
-	$(CC) $(CFLAGS) -o vale-ctl vale-ctl.o
 
 lb: lb.o pkt_hash.o
 	$(CC) $(CFLAGS) -o lb lb.o pkt_hash.o $(LDFLAGS)

Modified: stable/12/tools/tools/netmap/README
==============================================================================
--- stable/12/tools/tools/netmap/README	Thu Nov  7 19:54:24 2019	(r354470)
+++ stable/12/tools/tools/netmap/README	Thu Nov  7 20:09:41 2019	(r354471)
@@ -6,8 +6,6 @@ This directory contains applications that use the netm
 
 	bridge		a two-port jumper wire, also using the netmap API
 
-	vale-ctl	the program to control and inspect VALE switches
-
 	lb		an L3/L4 load balancer
 
 	nmreplay	a tool to playback a pcap file to a netmap port

Modified: stable/12/tools/tools/netmap/lb.8
==============================================================================
--- stable/12/tools/tools/netmap/lb.8	Thu Nov  7 19:54:24 2019	(r354470)
+++ stable/12/tools/tools/netmap/lb.8	Thu Nov  7 20:09:41 2019	(r354471)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 28, 2018
+.Dd October 26, 2019
 .Dt LB 8
 .Os
 .Sh NAME
@@ -111,7 +111,7 @@ If
 .Nm
 does not exit cleanly the ports will not be removed.
 Please use
-.Xr vale-ctl 4
+.Xr valectl 8
 to remove any stale persistent VALE port.
 .Sh SEE ALSO
 .Xr netmap 4 ,

Modified: stable/12/usr.sbin/Makefile
==============================================================================
--- stable/12/usr.sbin/Makefile	Thu Nov  7 19:54:24 2019	(r354470)
+++ stable/12/usr.sbin/Makefile	Thu Nov  7 20:09:41 2019	(r354471)
@@ -96,6 +96,7 @@ SUBDIR=	adduser \
 	trpt \
 	tzsetup \
 	ugidfw \
+	valectl \
 	vigr \
 	vipw \
 	wake \
