From d1279464ccfc6321075174f04b9df522b24cb674 Mon Sep 17 00:00:00 2001 From: Pravin B Shelar Date: Thu, 7 Aug 2014 12:40:34 -0700 Subject: [PATCH] dpdk: Update documentation. Add usage info for ovs-vswitchd dpdk option. Update INSTALL.DPDK file and man page. Reported-by: Hari Sasank Bhamidipalli Signed-off-by: Pravin B Shelar Acked-by: Ben Pfaff Acked-by: Flavio Leitner --- AUTHORS | 1 + INSTALL.DPDK | 5 ++--- vswitchd/ovs-vswitchd.8.in | 4 ++++ vswitchd/ovs-vswitchd.c | 2 ++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/AUTHORS b/AUTHORS index d1756ee50..8c5940d0a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -201,6 +201,7 @@ Greg Dahlman gdahlman@hotmail.com Gregor Schaffrath grsch@net.t-labs.tu-berlin.de Guolin Yang gyang@vmware.com Gur Stavi gstavi@mrv.com +Hari Sasank Bhamidipalli hbhamidi@cisco.com Hassan Khan hassan.khan@seecs.edu.pk Hector Oron hector.oron@gmail.com Henrik Amren henrik@nicira.com diff --git a/INSTALL.DPDK b/INSTALL.DPDK index c74fa5cde..4551f4cd9 100644 --- a/INSTALL.DPDK +++ b/INSTALL.DPDK @@ -72,8 +72,6 @@ First setup DPDK devices: 0000:02:00.0 0000:02:00.1 bind module new_id remove_id uevent unbind Prepare system: - - load ovs kernel module - e.g modprobe openvswitch - mount hugetlbfs e.g. mount -t hugetlbfs -o pagesize=1G none /mnt/huge/ @@ -101,7 +99,8 @@ Start ovsdb-server as discussed in INSTALL doc: Start vswitchd: DPDK configuration arguments can be passed to vswitchd via `--dpdk` -argument. dpdk arg -c is ignored by ovs-dpdk, but it is a required parameter +argument. This needs to be first argument passed to vswitchd process. +dpdk arg -c is ignored by ovs-dpdk, but it is a required parameter for dpdk initialization. e.g. diff --git a/vswitchd/ovs-vswitchd.8.in b/vswitchd/ovs-vswitchd.8.in index 0fd13e3c9..6e4929ccb 100644 --- a/vswitchd/ovs-vswitchd.8.in +++ b/vswitchd/ovs-vswitchd.8.in @@ -83,6 +83,10 @@ only allow privileged users, such as the superuser, to use it. \fBovs\-vswitchd\fR emits a log message if \fBmlockall()\fR is unavailable or unsuccessful. . +.SS "DPDK Options" +.IP "\fB\-\-dpdk\fR" +Initialize \fBovs\-vswitchd\fR DPDK datapath. Refer to INSTALL.DPDK +for details. .SS "Daemon Options" .ds DD \ \fBovs\-vswitchd\fR detaches only after it has connected to the \ diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c index 3c843e112..4d7e4f0fd 100644 --- a/vswitchd/ovs-vswitchd.c +++ b/vswitchd/ovs-vswitchd.c @@ -250,6 +250,8 @@ usage(void) stream_usage("DATABASE", true, false, true); daemon_usage(); vlog_usage(); + printf("\nDPDK options:\n" + " --dpdk options Initialize DPDK datapath.\n"); printf("\nOther options:\n" " --unixctl=SOCKET override default control socket name\n" " -h, --help display this help message\n" -- 2.20.1