From patchwork Sun Oct 22 14:48:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jamal Hadi Salim X-Patchwork-Id: 829053 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mojatatu-com.20150623.gappssmtp.com header.i=@mojatatu-com.20150623.gappssmtp.com header.b="I0zXTrOs"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yKjJ90ZjNz9sPt for ; Mon, 23 Oct 2017 01:55:21 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751244AbdJVOsX (ORCPT ); Sun, 22 Oct 2017 10:48:23 -0400 Received: from mail-io0-f194.google.com ([209.85.223.194]:48706 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751003AbdJVOsW (ORCPT ); Sun, 22 Oct 2017 10:48:22 -0400 Received: by mail-io0-f194.google.com with SMTP id j17so17612944iod.5 for ; Sun, 22 Oct 2017 07:48:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mojatatu-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=lQg1fjSWAUFsIGKfACBFbiFXX1ArAtgIautYDPxm6Yw=; b=I0zXTrOs3yO4bUpyqvoVsArDVkpduoWeoaCA07xE+ipWx07qaIzGRm/uZFJfRwGRNn DAv9gdxTn3dRtgIiHTnRHmKd0qUOsuKgJlkolljZsV3Z+EIoU3lOtAB7XHC8oiWznMA/ Xeq/4VGovR/Kgu2Ojiz3ysO14zNPQ0rICZXobItmVYTPFSXfFm4c9cmP/PDBUDXBGGpL yPa7g94yw6obFtqPhJjUsPM6lo09xnV+VAdOubeo0Nj1QnrE5Zfdq+FOGr8sfwYhUn3m X7FgSnoqxOjPXPxakmSvrYUiH2OTx0SHWYNTRp9O4La1WBCpelxWQtezeDe60qpZ358q pF8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=lQg1fjSWAUFsIGKfACBFbiFXX1ArAtgIautYDPxm6Yw=; b=BjJXg6qNhq0YElqiv8qFVz06sZ9yVZUXXqqSOGl364GK7rBW8ii7iqCcdUzGpmsv3j i13Ak4wwu5upYcxdABaKBBiL3wmblYBn5i6L1Q8QvrzLMu9jBaumyNl6FboNv5X9AWm8 xyzHAXWb56FyDzs3rev9AylsC3LZIS8E3O4IYGSJ3lO1IzKGYBg/HkdVZPDtsjRchyfQ UAvzN9p3D9HOWNCPbYrZPPe3b8eMua6ahzvvm1eExlNKHBoE92WbMHwV9CNI9BqdobgA wR2wOp+R6ijD6pKX5oqRoV6i2EceEijfPTYaoiHI+UabXyh28Dchj0LmHtj1gAXWN5bG B8lQ== X-Gm-Message-State: AMCzsaXGCkstvcX/SwvjS9b/fpyQsRx8QEoglrDkMKYt638X7tQUaJVB hcnVIfjXLk/QH0vB0wh3zW/6lF8/ X-Google-Smtp-Source: ABhQp+SoezXvRV9F544NCu5EziTx8n4l2tV63wmU4DhcHU4ftADD2Sts8oYsv+icNfF2Shd7HfJOHg== X-Received: by 10.107.201.5 with SMTP id z5mr13397605iof.139.1508683701288; Sun, 22 Oct 2017 07:48:21 -0700 (PDT) Received: from localhost.localdomain (135-23-93-187.cpe.pppoe.ca. [135.23.93.187]) by smtp.gmail.com with ESMTPSA id l5sm2273103ioe.13.2017.10.22.07.48.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 22 Oct 2017 07:48:19 -0700 (PDT) From: Jamal Hadi Salim X-Google-Original-From: Jamal Hadi Salim To: stephen@networkplumber.org Cc: netdev@vger.kernel.org, jiri@resnulli.us, xiyou.wangcong@gmail.com, Jamal Hadi Salim Subject: [PATCH iproute2 1/1] tc/actions: introduce support for jump action Date: Sun, 22 Oct 2017 10:48:10 -0400 Message-Id: <1508683690-3440-1-git-send-email-jhs@emojatatu.com> X-Mailer: git-send-email 1.9.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jamal Hadi Salim Seems like my old patches didnt make it into the tree - so here goes Sample use case: ... add ingress qdisc sudo $TC qdisc add dev $ETH ingress ... if we exceed rate of 1kbps (burst of 90K), do an absolute jump of 2 actions sudo $TC actions add action police rate 1kbit burst 90k conform-exceed jump 2 / pipe sudo $TC -s actions ls action police --- action order 0: police 0x4 rate 1Kbit burst 23440b mtu 2Kb action jump 2/pipe overhead 0b ref 1 bind 0 installed 41 sec used 41 sec Action statistics: Sent 0 bytes 0 pkt (dropped 0, overlimits 0 requeues 0) backlog 0b 0p requeues 0 -- ... lets add a couple of marks so we can use them to mark exceed/not exceed sudo $TC actions add action skbedit mark 11 ok index 11 sudo $TC actions add action skbedit mark 12 ok index 12 ... if we dont exceed our rate we get a mark of 11, else mark of 12 sudo $TC filter add dev $ETH parent ffff: protocol ip prio 8 u32 \ match ip dst 127.0.0.8/32 flowid 1:10 \ action police index 4 \ action skbedit index 11 \ action skbedit index 12 Ok, lets keep this thing a little busy.. sudo ping -f -c 10000 127.0.0.8 ... now lets see the filters.. sudo $TC -s filter ls dev $ETH parent ffff: protocol ip ---- filter pref 8 u32 chain 0 filter pref 8 u32 chain 0 fh 800: ht divisor 1 filter pref 8 u32 chain 0 fh 800::800 order 2048 key ht 800 bkt 0 flowid 1:10 not_in_hw (rule hit 20000 success 10000) match 7f000008/ffffffff at 16 (success 10000 ) action order 1: police 0x4 rate 1Kbit burst 23440b mtu 2Kb action jump 2/pipe overhead 0b ref 2 bind 1 installed 198 sec used 2 sec Action statistics: Sent 840000 bytes 10000 pkt (dropped 0, overlimits 9721 requeues 0) backlog 0b 0p requeues 0 action order 2: skbedit mark 11 pass index 11 ref 2 bind 1 installed 127 sec used 2 sec Action statistics: Sent 23436 bytes 279 pkt (dropped 0, overlimits 0 requeues 0) backlog 0b 0p requeues 0 action order 3: skbedit mark 12 pass index 12 ref 2 bind 1 installed 127 sec used 2 sec Action statistics: Sent 816564 bytes 9721 pkt (dropped 0, overlimits 0 requeues 0) backlog 0b 0p requeues 0 ----- As can be seen 97.21% of the packets were marked as exceeding the allocated rate; you could do something clever with the skb mark after this. Signed-off-by: Jamal Hadi Salim --- tc/m_gact.c | 6 ++++-- tc/tc_util.c | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/tc/m_gact.c b/tc/m_gact.c index df143c9..38949e9 100644 --- a/tc/m_gact.c +++ b/tc/m_gact.c @@ -46,18 +46,20 @@ explain(void) fprintf(stderr, "Usage: ... gact [RAND] [INDEX]\n"); fprintf(stderr, "Where: \tACTION := reclassify | drop | continue | pass | pipe |\n" - " \t goto chain \n" + " \t goto chain | jump \n" "\tRAND := random \n" "\tRANDTYPE := netrand | determ\n" "\tVAL : = value not exceeding 10000\n" + "\tJUMP_COUNT := Absolute jump from start of action list\n" "\tINDEX := index value used\n" "\n"); #else fprintf(stderr, "Usage: ... gact [INDEX]\n"); fprintf(stderr, "Where: \tACTION := reclassify | drop | continue | pass | pipe |\n" - " \t goto chain \n" + " \t goto chain | jump \n" "\tINDEX := index value used\n" + "\tJUMP_COUNT := Absolute jump from start of action list\n" "\n"); #endif } diff --git a/tc/tc_util.c b/tc/tc_util.c index 50d3550..b39e550 100644 --- a/tc/tc_util.c +++ b/tc/tc_util.c @@ -417,6 +417,8 @@ static const char *action_n2a(int action) if (TC_ACT_EXT_CMP(action, TC_ACT_GOTO_CHAIN)) return "goto"; + if (TC_ACT_EXT_CMP(action, TC_ACT_JUMP)) + return "jump"; switch (action) { case TC_ACT_UNSPEC: return "continue"; @@ -463,6 +465,7 @@ static int action_a2n(char *arg, int *result, bool allow_num) {"reclassify", TC_ACT_RECLASSIFY}, {"pipe", TC_ACT_PIPE}, {"goto", TC_ACT_GOTO_CHAIN}, + {"jump", TC_ACT_JUMP}, {"trap", TC_ACT_TRAP}, { NULL }, }, *iter; @@ -510,6 +513,17 @@ static int __parse_action_control(int *argc_p, char ***argv_p, int *result_p, } result |= chain_index; } + if (result == TC_ACT_JUMP) { + __u32 jump_cnt = 0; + + NEXT_ARG(); + if (get_u32(&jump_cnt, *argv, 10) || + jump_cnt > TC_ACT_EXT_VAL_MASK) { + fprintf(stderr, "Invalid \"jump count\" (%s)\n", *argv); + return -1; + } + result |= jump_cnt; + } NEXT_ARG_FWD(); *argc_p = argc; *argv_p = argv; @@ -637,6 +651,8 @@ void print_action_control(FILE *f, const char *prefix, fprintf(f, "%s%s", prefix, action_n2a(action)); if (TC_ACT_EXT_CMP(action, TC_ACT_GOTO_CHAIN)) fprintf(f, " chain %u", action & TC_ACT_EXT_VAL_MASK); + if (TC_ACT_EXT_CMP(action, TC_ACT_JUMP)) + fprintf(f, " %u", action & TC_ACT_EXT_VAL_MASK); fprintf(f, "%s", suffix); }