From patchwork Mon Oct 6 11:41:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jamal Hadi Salim X-Patchwork-Id: 396780 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B5C231400B2 for ; Mon, 6 Oct 2014 22:41:37 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751895AbaJFLle (ORCPT ); Mon, 6 Oct 2014 07:41:34 -0400 Received: from mail-ie0-f180.google.com ([209.85.223.180]:59675 "EHLO mail-ie0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751407AbaJFLlc (ORCPT ); Mon, 6 Oct 2014 07:41:32 -0400 Received: by mail-ie0-f180.google.com with SMTP id x19so3004808ier.25 for ; Mon, 06 Oct 2014 04:41:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=QjbZZ1wp2zBm6GqxXTQB6/Xc+tm5pp1M7VHfX+YlcAE=; b=VoI3T7EU2x2hQy6akci0eICTqCgbKdkkIlZve7OS4HIsehmaKZD9sYshfidkMh04nG W5wq6GH48Z0mTHVSd5oTtWbb09u7qq0L3gopXgs/ejLRZ/FQib3LJiMC3EtZrKlu5vHb H48ozp1/MjZCvad/2h19owQCGJDkwK9NeuK5hbIcf6XfUww0YCQ5nISSj8vO92xC5Bej ISw0Yos3yNdro5PJd5yW09ueLcMrxdDnYklS2Cj6pwSnC019rTpPIZW9jm5EHjjyanAO qc4rsJkoz9fiEPVFChwiQWH3N1ll8SpksKdqd15YCTUA0e6EXxETD5tyUUrHeYxAIq0Z xAaQ== X-Gm-Message-State: ALoCoQmWwQ9C9OV0NpV6MRM32tR84I4wv+gbELhz3ZbV3ixaTYYzdcyN5kOX/J2h5Zr7UxGmBMiO X-Received: by 10.50.28.13 with SMTP id x13mr20491830igg.8.1412595691700; Mon, 06 Oct 2014 04:41:31 -0700 (PDT) Received: from jhs-1.lan (198-48-235-155.cpe.pppoe.ca. [198.48.235.155]) by mx.google.com with ESMTPSA id oq6sm3547359igb.2.2014.10.06.04.41.30 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 06 Oct 2014 04:41:31 -0700 (PDT) From: Jamal Hadi Salim X-Google-Original-From: Jamal Hadi Salim To: stephen@networkplumber.org Cc: netdev@vger.kernel.org, xiyou.wangcong@gmail.com, john.r.fastabend@intel.com, Jamal Hadi Salim , Jamal Hadi Salim Subject: [iproute2 1/1] discourage use of direct policer interface Date: Mon, 6 Oct 2014 07:41:21 -0400 Message-Id: <1412595681-7302-1-git-send-email-jhs@emojatatu.com> X-Mailer: git-send-email 1.7.9.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jamal Hadi Salim Signed-off-by: Jamal Hadi Salim --- tc/f_basic.c | 3 ++- tc/f_bpf.c | 5 +++-- tc/f_cgroup.c | 4 ++-- tc/f_flow.c | 2 +- tc/f_fw.c | 4 ++-- tc/f_rsvp.c | 4 ++-- tc/f_u32.c | 2 +- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/tc/f_basic.c b/tc/f_basic.c index 67d26ec..1c33ca3 100644 --- a/tc/f_basic.c +++ b/tc/f_basic.c @@ -27,11 +27,12 @@ static void explain(void) { - fprintf(stderr, "Usage: ... basic [ match EMATCH_TREE ] [ police POLICE_SPEC ]\n"); + fprintf(stderr, "Usage: ... basic [ match EMATCH_TREE ] \n"); fprintf(stderr, " [ action ACTION_SPEC ] [ classid CLASSID ]\n"); fprintf(stderr, "\n"); fprintf(stderr, "Where: SELECTOR := SAMPLE SAMPLE ...\n"); fprintf(stderr, " FILTERID := X:Y:Z\n"); + fprintf(stderr, " ACTION_SPEC := ... look at individual actions\n"); fprintf(stderr, "\nNOTE: CLASSID is parsed as hexadecimal input.\n"); } diff --git a/tc/f_bpf.c b/tc/f_bpf.c index 8f1593c..48635a7 100644 --- a/tc/f_bpf.c +++ b/tc/f_bpf.c @@ -34,13 +34,14 @@ static void explain(void) fprintf(stderr, " [inline]: run bytecode BPF_BYTECODE\n"); fprintf(stderr, " [from file]: run bytecode-file FILE\n"); fprintf(stderr, "\n"); - fprintf(stderr, " [ police POLICE_SPEC ] [ action ACTION_SPEC ]\n"); + fprintf(stderr, " [ action ACTION_SPEC ]\n"); fprintf(stderr, " [ classid CLASSID ]\n"); fprintf(stderr, "\n"); fprintf(stderr, "Where BPF_BYTECODE := \'s,c t f k,c t f k,c t f k,...\'\n"); fprintf(stderr, " c,t,f,k and s are decimals; s denotes number of 4-tuples\n"); fprintf(stderr, "Where FILE points to a file containing the BPF_BYTECODE string\n"); - fprintf(stderr, "\nNOTE: CLASSID is parsed as hexadecimal input.\n"); + fprintf(stderr, "\nACTION_SPEC := ... look at individual actions\n"); + fprintf(stderr, "NOTE: CLASSID is parsed as hexadecimal input.\n"); } static int bpf_parse_string(char *arg, bool from_file, __u16 *bpf_len, diff --git a/tc/f_cgroup.c b/tc/f_cgroup.c index 4a4026e..53f7406 100644 --- a/tc/f_cgroup.c +++ b/tc/f_cgroup.c @@ -18,8 +18,8 @@ static void explain(void) { - fprintf(stderr, "Usage: ... cgroup [ match EMATCH_TREE ] [ police POLICE_SPEC ]\n"); - fprintf(stderr, " [ action ACTION_SPEC ]\n"); + fprintf(stderr, "Usage: ... cgroup [ match EMATCH_TREE ]\n"); + fprintf(stderr, " [ action ACTION_SPEC ]\n"); } static int cgroup_parse_opt(struct filter_util *qu, char *handle, diff --git a/tc/f_flow.c b/tc/f_flow.c index 7d4bb7a..b454a65 100644 --- a/tc/f_flow.c +++ b/tc/f_flow.c @@ -27,7 +27,7 @@ static void explain(void) " [hashing mode]: hash keys KEY-LIST ... [ perturb SECS ]\n" "\n" " [ divisor NUM ] [ baseclass ID ] [ match EMATCH_TREE ]\n" -" [ police POLICE_SPEC ] [ action ACTION_SPEC ]\n" +" [ action ACTION_SPEC ]\n" "\n" "KEY-LIST := [ KEY-LIST , ] KEY\n" "KEY := [ src | dst | proto | proto-src | proto-dst | iif | priority | \n" diff --git a/tc/f_fw.c b/tc/f_fw.c index 161e2f7..165f489 100644 --- a/tc/f_fw.c +++ b/tc/f_fw.c @@ -25,8 +25,8 @@ static void explain(void) { - fprintf(stderr, "Usage: ... fw [ classid CLASSID ] [ police POLICE_SPEC ]\n"); - fprintf(stderr, " POLICE_SPEC := ... look at TBF\n"); + fprintf(stderr, "Usage: ... fw [ classid CLASSID ] [ action ACTION_SPEC ]\n"); + fprintf(stderr, " ACTION_SPEC := ... look at individual actions\n"); fprintf(stderr, " CLASSID := X:Y\n"); fprintf(stderr, "\nNOTE: CLASSID is parsed as hexadecimal input.\n"); } diff --git a/tc/f_rsvp.c b/tc/f_rsvp.c index 14f24b1..cb7b8fb 100644 --- a/tc/f_rsvp.c +++ b/tc/f_rsvp.c @@ -28,11 +28,11 @@ static void explain(void) { fprintf(stderr, "Usage: ... rsvp ipproto PROTOCOL session DST[/PORT | GPI ]\n"); fprintf(stderr, " [ sender SRC[/PORT | GPI ]\n"); - fprintf(stderr, " [ classid CLASSID ] [ police POLICE_SPEC ]\n"); + fprintf(stderr, " [ classid CLASSID ] [ action ACTION_SPEC ]\n"); fprintf(stderr, " [ tunnelid ID ] [ tunnel ID skip NUMBER ]\n"); fprintf(stderr, "Where: GPI := { flowlabel NUMBER | spi/ah SPI | spi/esp SPI |\n"); fprintf(stderr, " u{8|16|32} NUMBER mask MASK at OFFSET}\n"); - fprintf(stderr, " POLICE_SPEC := ... look at TBF\n"); + fprintf(stderr, " ACTION_SPEC := ... look at individual actions\n"); fprintf(stderr, " FILTERID := X:Y\n"); fprintf(stderr, "\nNOTE: CLASSID is parsed as hexadecimal input.\n"); } diff --git a/tc/f_u32.c b/tc/f_u32.c index f2a862d..80a5097 100644 --- a/tc/f_u32.c +++ b/tc/f_u32.c @@ -32,7 +32,7 @@ static void explain(void) { fprintf(stderr, "Usage: ... u32 [ match SELECTOR ... ] [ link HTID ]" " [ classid CLASSID ]\n"); - fprintf(stderr, " [ police POLICE_SPEC ]" + fprintf(stderr, " [ action ACTION_SPEC ]" " [ offset OFFSET_SPEC ]\n"); fprintf(stderr, " [ ht HTID ] [ hashkey HASHKEY_SPEC ]\n"); fprintf(stderr, " [ sample SAMPLE ]\n");