From patchwork Wed Apr 19 01:08:02 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: 752061 X-Patchwork-Delegate: davem@davemloft.net 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 3w73mP1cNbz9rxw for ; Wed, 19 Apr 2017 11:08:53 +1000 (AEST) 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="Aa8uI4sp"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758848AbdDSBIv (ORCPT ); Tue, 18 Apr 2017 21:08:51 -0400 Received: from mail-it0-f66.google.com ([209.85.214.66]:33066 "EHLO mail-it0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758841AbdDSBIr (ORCPT ); Tue, 18 Apr 2017 21:08:47 -0400 Received: by mail-it0-f66.google.com with SMTP id z67so906767itb.0 for ; Tue, 18 Apr 2017 18:08:47 -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:in-reply-to:references; bh=36s3dwISvk6iZojg06vKHoby1VgoSQw9WMmft7qcUl4=; b=Aa8uI4sptVoZlg/anP4ct5uXrpK9dLouJ3jrCVQXb7iZFsNyS9eETP4r5NUJT69MJd 4ZbU9yVBSmbF8rMRl7b160czhJvCPMXN8Jeyj8D9fD0mmrmQbPDVrL0gSuIrmsmK7A4b UvI9MsheaybGXDTJ2fnG17+2k8rCxnnIuYJdj7Pia2hL6d+JxClvLV7PJH5N3yhIzfRx b2+gckeTPAU+gpZ+7j3lKOJ9twwfXF/Ost6OuASTqJNYvugChl57OsRzU5nb8eU9xLFV khPUeHmvS78497clqrekXd+ap826Rau0t+E1HWF7e3fWpxlDWAhgXUU7+HHOBnQaon1w iqRQ== 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:in-reply-to :references; bh=36s3dwISvk6iZojg06vKHoby1VgoSQw9WMmft7qcUl4=; b=SSZHFCqb+oo17dtKs88tQ4Tw2e8fP9rivn8j0x/UjnaR9/8Wzn6iOxY6fcyPF6L2wL TxJGKFsAgrdoMbOccbFaDEJJiUIMpb11UchKWBZAILkd6xxU/UYKsQAqVp/Eb90aaBZq F3UM14TeRS5mfvjyeqRGF3bZnH1LTy+qmurPgNjzmlJwq2Ist1GoF9UsvVpPZVF2YffI K99zTGM17a2TdaPCf6j2uWxPAtaIa24MD8wCNRtzw0cjainIrAy9/o5CqkzhfKEMN4eJ WZTCtUOcRL/DQaesJcGRCMaHsVWhB3zayD2RUFQJ5TKaoDfWi4/6fCHfeXcHNhenIFeX 4E5g== X-Gm-Message-State: AN3rC/5sXFW8uSq15ycxjGcs5MEuFFKyDZ/5pSVXId5o7yih33PKJVQ6 ELMXVZ365IzUCg== X-Received: by 10.36.28.146 with SMTP id c140mr17637398itc.36.1492564126423; Tue, 18 Apr 2017 18:08:46 -0700 (PDT) Received: from localhost.localdomain (23-233-25-245.cpe.pppoe.ca. [23.233.25.245]) by smtp.gmail.com with ESMTPSA id d139sm5710913itd.6.2017.04.18.18.08.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Apr 2017 18:08:45 -0700 (PDT) From: Jamal Hadi Salim X-Google-Original-From: Jamal Hadi Salim To: davem@davemloft.net Cc: netdev@vger.kernel.org, eric.dumazet@gmail.com, jiri@resnulli.us, xiyou.wangcong@gmail.com, Jamal Hadi Salim Subject: [PATCH net-next 2/2] net sched actions: add time filter for action dumping Date: Tue, 18 Apr 2017 21:08:02 -0400 Message-Id: <1492564082-28685-2-git-send-email-jhs@emojatatu.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1492564082-28685-1-git-send-email-jhs@emojatatu.com> References: <1492564082-28685-1-git-send-email-jhs@emojatatu.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jamal Hadi Salim This adds support for filtering based on time since last used. When we are dumping a large number of actions it is useful to have the option of filtering based on when the action was last used to reduce the amount of data crossing to user space. With this patch the user space app sets the TCAA_ACT_TIME_FILTER attribute with the value in milliseconds with "time of interest since now". The kernel converts this to jiffies and does the filtering comparison matching entries that have seen activity since then and returns them to user space. Old kernels and old tc continue to work in legacy mode since they dont specify this attribute. Some example (we have 400 actions bound to 400 filters); at installation time using hacked tc which sets the time of interest to 120 seconds: prompt$ hackedtc actions ls action gact | grep index | wc -l 400 go get some coffee and wait for > 120 seconds and try again: prompt$ hackedtc actions ls action gact | grep index | wc -l 0 Lets see a filter bound to one of these actions: .. filter pref 10 u32 filter pref 10 u32 fh 800: ht divisor 1 filter pref 10 u32 fh 800::800 order 2048 key ht 800 bkt 0 flowid 1:10 (rule hit 2 success 1) match 7f000002/ffffffff at 12 (success 1 ) action order 1: gact action pass random type none pass val 0 index 23 ref 2 bind 1 installed 1145 sec used 802 sec Action statistics: Sent 84 bytes 1 pkt (dropped 0, overlimits 0 requeues 0) backlog 0b 0p requeues 0 .... that coffee took long, no? Now lets ping -c 1 127.0.0.2, then run the actions again: prompt$ hackedtc actions ls action gact | grep index | wc -l 1 More details please: prompt$ hackedtc -s actions ls action gact total acts 1 flags 0x3 action order 0: gact action pass random type none pass val 0 index 23 ref 2 bind 1 installed 1270 sec used 30 sec Action statistics: Sent 168 bytes 2 pkt (dropped 0, overlimits 0 requeues 0) backlog 0b 0p requeues 0 And the filter? filter pref 10 u32 filter pref 10 u32 fh 800: ht divisor 1 filter pref 10 u32 fh 800::800 order 2048 key ht 800 bkt 0 flowid 1:10 (rule hit 4 success 2) match 7f000002/ffffffff at 12 (success 2 ) action order 1: gact action pass random type none pass val 0 index 23 ref 2 bind 1 installed 1324 sec used 84 sec Action statistics: Sent 168 bytes 2 pkt (dropped 0, overlimits 0 requeues 0) backlog 0b 0p requeues 0 Signed-off-by: Jamal Hadi Salim --- include/uapi/linux/rtnetlink.h | 1 + net/sched/act_api.c | 23 +++++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h index c7080ec..1b36cc0 100644 --- a/include/uapi/linux/rtnetlink.h +++ b/include/uapi/linux/rtnetlink.h @@ -680,6 +680,7 @@ enum { TCAA_ACT_TAB, TCAA_ACT_FLAGS, TCAA_ACT_COUNT, + TCAA_ACT_TIME_FILTER, __TCAA_MAX }; diff --git a/net/sched/act_api.c b/net/sched/act_api.c index 45e1cf7..cb5b23d 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c @@ -84,11 +84,12 @@ static int tcf_dump_walker(struct tcf_hashinfo *hinfo, struct sk_buff *skb, { int err = 0, index = -1, i = 0, s_i = 0, n_i = 0; unsigned short act_flags = cb->args[2]; + unsigned long jiffy_filter = cb->args[3]; struct nlattr *nest; spin_lock_bh(&hinfo->lock); - s_i = cb->args[0]; + s_i = cb->args[4]; for (i = 0; i < (hinfo->hmask + 1); i++) { struct hlist_head *head; @@ -101,6 +102,11 @@ static int tcf_dump_walker(struct tcf_hashinfo *hinfo, struct sk_buff *skb, if (index < s_i) continue; + if (jiffy_filter && + time_after(jiffy_filter, + (unsigned long)p->tcfa_tm.lastuse)) + continue; + nest = nla_nest_start(skb, n_i); if (nest == NULL) goto nla_put_failure; @@ -118,6 +124,9 @@ static int tcf_dump_walker(struct tcf_hashinfo *hinfo, struct sk_buff *skb, } } done: + if (index > 0) + cb->args[4] = index + 1; + spin_unlock_bh(&hinfo->lock); if (n_i) { cb->args[0] += n_i; @@ -1090,13 +1099,14 @@ static int tc_dump_action(struct sk_buff *skb, struct netlink_callback *cb) struct tcamsg *t = (struct tcamsg *) nlmsg_data(cb->nlh); struct nlattr *kind = NULL; u32 act_flags = 0; + u32 msecs_filter = 0; + unsigned long jiffy_wanted = 0; ret = nlmsg_parse(cb->nlh, sizeof(struct tcamsg), tcaa, TCAA_MAX, tcaa_policy, NULL); if (ret < 0) return ret; - kind = find_dump_kind(tcaa); if (kind == NULL) { pr_info("tc_dump_action: action bad kind\n"); @@ -1110,12 +1120,21 @@ static int tc_dump_action(struct sk_buff *skb, struct netlink_callback *cb) if (tcaa[TCAA_ACT_FLAGS]) act_flags = nla_get_u32(tcaa[TCAA_ACT_FLAGS]); + if (tcaa[TCAA_ACT_TIME_FILTER]) + msecs_filter = nla_get_u32(tcaa[TCAA_ACT_TIME_FILTER]); + nlh = nlmsg_put(skb, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, cb->nlh->nlmsg_type, sizeof(*t), 0); if (!nlh) goto out_module_put; + if (msecs_filter) { + unsigned long jiffy_msecs = msecs_to_jiffies(msecs_filter); + jiffy_wanted = jiffies - jiffy_msecs; + } + cb->args[2] = act_flags; + cb->args[3] = jiffy_wanted; t = nlmsg_data(nlh); t->tca_family = AF_UNSPEC;