From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9026C169C4 for ; Tue, 29 Jan 2019 18:08:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AB9DB2184D for ; Tue, 29 Jan 2019 18:08:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727898AbfA2SIP (ORCPT ); Tue, 29 Jan 2019 13:08:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52892 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727368AbfA2SIP (ORCPT ); Tue, 29 Jan 2019 13:08:15 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B39C87AE81; Tue, 29 Jan 2019 18:08:14 +0000 (UTC) Received: from localhost.localdomain (ovpn-116-32.gru2.redhat.com [10.97.116.32]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 173535D6A6; Tue, 29 Jan 2019 18:08:12 +0000 (UTC) Received: by localhost.localdomain (Postfix, from userid 1000) id 941C3180B7C; Tue, 29 Jan 2019 16:08:10 -0200 (-02) Date: Tue, 29 Jan 2019 16:08:10 -0200 From: Marcelo Leitner To: Paul Blakey Cc: Guy Shattah , Aaron Conole , John Hurley , Simon Horman , Justin Pettit , Gregory Rose , Eelco Chaudron , Flavio Leitner , Florian Westphal , Jiri Pirko , Rashid Khan , Sushil Kulkarni , Andy Gospodarek , Roi Dayan , Yossi Kuperman , Or Gerlitz , Rony Efraim , "davem@davemloft.net" , netdev@vger.kernel.org Subject: Re: [RFC PATCH net-next 3/6 v2] net/sched: cls_flower: Add ematch support Message-ID: <20190129180810.GX10660@localhost.localdomain> References: <1548748926-23822-2-git-send-email-paulb@mellanox.com> <1548748926-23822-4-git-send-email-paulb@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1548748926-23822-4-git-send-email-paulb@mellanox.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 29 Jan 2019 18:08:14 +0000 (UTC) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Tue, Jan 29, 2019 at 10:02:03AM +0200, Paul Blakey wrote: > TODO: handle EEXist. > > Signed-off-by: Paul Blakey > --- > include/uapi/linux/pkt_cls.h | 2 ++ > net/sched/cls_flower.c | 22 ++++++++++++++++++---- > 2 files changed, 20 insertions(+), 4 deletions(-) > > diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h > index 121f1ef..d848d6d 100644 > --- a/include/uapi/linux/pkt_cls.h > +++ b/include/uapi/linux/pkt_cls.h > @@ -506,6 +506,8 @@ enum { > TCA_FLOWER_KEY_CT_LABELS, > TCA_FLOWER_KEY_CT_LABELS_MASK, > > + TCA_FLOWER_EMATCHES, > + > __TCA_FLOWER_MAX, > }; > > diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c > index bf74a31..f11fda0 100644 > --- a/net/sched/cls_flower.c > +++ b/net/sched/cls_flower.c > @@ -104,6 +104,7 @@ struct cls_fl_filter { > struct rhash_head ht_node; > struct fl_flow_key mkey; > struct tcf_exts exts; > + struct tcf_ematch_tree ematches; > struct tcf_result res; > struct fl_flow_key key; > struct list_head list; > @@ -332,10 +333,14 @@ static int fl_classify(struct sk_buff *skb, const struct tcf_proto *tp, > fl_set_masked_key(&skb_mkey, &skb_key, mask); > > f = fl_lookup(mask, &skb_mkey, &skb_key); > - if (f && !tc_skip_sw(f->flags)) { > - *res = f->res; > - return tcf_exts_exec(skb, &f->exts, res); > - } > + if (!f || tc_skip_sw(f->flags)) > + continue; > + > + if (!tcf_em_tree_match(skb, &f->ematches, NULL)) > + continue; Considering just the recirc_id (and not the other fields supported by ematch), have you considered integrating recirc_id match on flow dissector instead? It would avoid the matching in 2 steps here and benefit from the hashing. > + > + *res = f->res; > + return tcf_exts_exec(skb, &f->exts, res); > } > return -1; > } > @@ -388,6 +393,7 @@ static bool fl_mask_put(struct cls_fl_head *head, struct fl_flow_mask *mask, > static void __fl_destroy_filter(struct cls_fl_filter *f) > { > tcf_exts_destroy(&f->exts); > + tcf_em_tree_destroy(&f->ematches); > tcf_exts_put_net(&f->exts); > kfree(f); > } > @@ -523,6 +529,7 @@ static void *fl_get(struct tcf_proto *tp, u32 handle) > static const struct nla_policy fl_policy[TCA_FLOWER_MAX + 1] = { > [TCA_FLOWER_UNSPEC] = { .type = NLA_UNSPEC }, > [TCA_FLOWER_CLASSID] = { .type = NLA_U32 }, > + [TCA_FLOWER_EMATCHES] = { .type = NLA_NESTED }, > [TCA_FLOWER_INDEV] = { .type = NLA_STRING, > .len = IFNAMSIZ }, > [TCA_FLOWER_KEY_ETH_DST] = { .len = ETH_ALEN }, > @@ -1348,6 +1355,10 @@ static int fl_set_parms(struct net *net, struct tcf_proto *tp, > if (err < 0) > return err; > > + err = tcf_em_tree_validate(tp, tb[TCA_FLOWER_EMATCHES], &f->ematches); > + if (err < 0) > + return err; > + > if (tb[TCA_FLOWER_CLASSID]) { > f->res.classid = nla_get_u32(tb[TCA_FLOWER_CLASSID]); > tcf_bind_filter(tp, &f->res, base); > @@ -2143,6 +2154,9 @@ static int fl_dump(struct net *net, struct tcf_proto *tp, void *fh, > nla_put_u32(skb, TCA_FLOWER_CLASSID, f->res.classid)) > goto nla_put_failure; > > + if (tcf_em_tree_dump(skb, &f->ematches, TCA_FLOWER_EMATCHES) < 0) > + goto nla_put_failure; > + > key = &f->key; > mask = &f->mask->key; > > -- > 1.8.3.1 >