From: Jesper Dangaard Brouer <brouer@redhat.com>
To: netdev@vger.kernel.org
Cc: Jesper Dangaard Brouer <brouer@redhat.com>,
Daniel Borkmann <borkmann@iogearbox.net>,
Alexei Starovoitov <ast@plumgrid.com>,
Robert Olsson <robert@herjulf.se>,
Ben Greear <greearb@candelatech.com>,
Cong Wang <cwang@twopensource.com>
Subject: [net-next PATCH v3 05/10] pktgen: make /proc/net/pktgen/pgctrl report fail on invalid input
Date: Thu, 21 May 2015 12:16:56 +0200 [thread overview]
Message-ID: <20150521101651.15148.28911.stgit@ivy> (raw)
In-Reply-To: <20150521101501.15148.10609.stgit@ivy>
Giving /proc/net/pktgen/pgctrl an invalid command just returns shell
success and prints a warning in dmesg. This is not very useful for
shell scripting, as it can only detect the error by parsing dmesg.
Instead return -EINVAL when the command is unknown, as this provides
userspace shell scripting a way of detecting this.
Also bump version tag to 2.75, because (1) reading /proc/net/pktgen/pgctrl
output this version number which would allow to detect this small
semantic change, and (2) because the pktgen version tag have not been
updated since 2010.
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
---
net/core/pktgen.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 167e592..676550f 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -177,7 +177,7 @@
#include <asm/dma.h>
#include <asm/div64.h> /* do_div */
-#define VERSION "2.74"
+#define VERSION "2.75"
#define IP_NAME_SZ 32
#define MAX_MPLS_LABELS 16 /* This is the max label stack depth */
#define MPLS_STACK_BOTTOM htonl(0x00000100)
@@ -512,7 +512,7 @@ static ssize_t pgctrl_write(struct file *file, const char __user *buf,
pktgen_reset_all_threads(pn);
else
- pr_warn("Unknown command: %s\n", data);
+ return -EINVAL;
return count;
}
next prev parent reply other threads:[~2015-05-21 10:17 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-21 10:15 [net-next PATCH v3 00/10] pktgen: cleanups and introducing new samples/pktgen scripts Jesper Dangaard Brouer
2015-05-21 10:15 ` [net-next PATCH v3 01/10] pktgen: remove obsolete "max_before_softirq" from pktgen doc Jesper Dangaard Brouer
2015-05-21 10:16 ` [net-next PATCH v3 02/10] pktgen: adjust spacing in proc file interface output Jesper Dangaard Brouer
2015-05-21 10:16 ` [net-next PATCH v3 03/10] pktgen: doc were missing several config options Jesper Dangaard Brouer
2015-05-21 10:16 ` [net-next PATCH v3 04/10] pktgen: document ability to add same device to several threads Jesper Dangaard Brouer
2015-05-21 10:16 ` Jesper Dangaard Brouer [this message]
2015-05-21 10:17 ` [net-next PATCH v3 06/10] pktgen: new pktgen helper functions for samples scripts Jesper Dangaard Brouer
2015-05-21 10:17 ` [net-next PATCH v3 07/10] pktgen: add sample script pktgen_sample01_simple.sh Jesper Dangaard Brouer
2015-05-21 10:17 ` [net-next PATCH v3 08/10] pktgen: add sample script pktgen_sample02_multiqueue.sh Jesper Dangaard Brouer
2015-05-21 10:18 ` [net-next PATCH v3 09/10] pktgen: add sample script pktgen_sample03_burst_single_flow.sh Jesper Dangaard Brouer
2015-05-21 10:18 ` [net-next PATCH v3 10/10] pktgen: add benchmark script pktgen_bench_xmit_mode_netif_receive.sh Jesper Dangaard Brouer
2015-05-22 3:31 ` [net-next PATCH v3 00/10] pktgen: cleanups and introducing new samples/pktgen scripts David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150521101651.15148.28911.stgit@ivy \
--to=brouer@redhat.com \
--cc=ast@plumgrid.com \
--cc=borkmann@iogearbox.net \
--cc=cwang@twopensource.com \
--cc=greearb@candelatech.com \
--cc=netdev@vger.kernel.org \
--cc=robert@herjulf.se \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).