From patchwork Sun Aug 14 14:06:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Vadai X-Patchwork-Id: 659036 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 3sC0n50qpbz9t0p for ; Mon, 15 Aug 2016 00:07:21 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753168AbcHNOHO (ORCPT ); Sun, 14 Aug 2016 10:07:14 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:33172 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752590AbcHNOHL (ORCPT ); Sun, 14 Aug 2016 10:07:11 -0400 Received: by mail-wm0-f65.google.com with SMTP id o80so6565880wme.0 for ; Sun, 14 Aug 2016 07:07:10 -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:in-reply-to :references; bh=ZPXpjN88ffxBaOvCmktm+xZC8mQKQuznGYnpkKnU/4o=; b=cFBSz42ww3zxHzoyqq3UJK6lkhDUyk7YglpnQNo/i8/2xbHUgWVByGUp+PRQki0GQf 7J9I2xMBkA7Z4UORgfWQqOj/oj30S3MMmM36aCKqj/SFmOy0vbckZE4OYQ/XKUSJnIhU bHmWxeU+MppIKmp6Q6YFWTKTHexNtxF/thDThNEZfwIA3hfIHUtfalJp59HS26wwpj9g 6kEWfJPFTjF8LtV1TrHe1fTItPTdNIBpQrvWnE6zv7g7yjD21cwKdNU5mbuaqdOZvzVB xodk4d4JdX7YnRIvcNU90qfxPDJqK8ZKY30jS9uDQDOh4D4CZ+TYRoqcQzx0ZO/O1BEw pudw== X-Gm-Message-State: AEkooutJk5HZKFoiYwukjGS1kTTXrf3oWDDdK3LCFaQNvM4MR9XxX7ncV2Wu2TjyP77fGg== X-Received: by 10.28.113.151 with SMTP id d23mr9403745wmi.89.1471183629921; Sun, 14 Aug 2016 07:07:09 -0700 (PDT) Received: from office.vadai.me (212.116.172.4.static.012.net.il. [212.116.172.4]) by smtp.gmail.com with ESMTPSA id u72sm11839746wmf.5.2016.08.14.07.07.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 14 Aug 2016 07:07:09 -0700 (PDT) From: Amir Vadai To: Jamal Hadi Salim , Jiri Pirko Cc: netdev@vger.kernel.org, Or Gerlitz , Hadar Har-Zion , Oded Shanoon , Amir Vadai Subject: [RFC net-next 1/2] net/sched: cls_flower: Introduce classify by vxlan outer headers Date: Sun, 14 Aug 2016 17:06:51 +0300 Message-Id: <20160814140652.15985-2-amir@vadai.me> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160814140652.15985-1-amir@vadai.me> References: <20160814140652.15985-1-amir@vadai.me> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Amir Vadai > Signed-off-by: Amir Vadai > --- include/uapi/linux/pkt_cls.h | 11 +++++++++ net/sched/cls_flower.c | 53 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h index d1c1ccaba787..a192195a5516 100644 --- a/include/uapi/linux/pkt_cls.h +++ b/include/uapi/linux/pkt_cls.h @@ -428,6 +428,17 @@ enum { TCA_FLOWER_KEY_UDP_DST, /* be16 */ TCA_FLOWER_FLAGS, + + TCA_FLOWER_KEY_ENC_IPV4_SRC, /* be32 */ + TCA_FLOWER_KEY_ENC_IPV4_SRC_MASK,/* be32 */ + TCA_FLOWER_KEY_ENC_IPV4_DST, /* be32 */ + TCA_FLOWER_KEY_ENC_IPV4_DST_MASK,/* be32 */ + TCA_FLOWER_KEY_ENC_IPV6_SRC, /* struct in6_addr */ + TCA_FLOWER_KEY_ENC_IPV6_SRC_MASK, /* struct in6_addr */ + TCA_FLOWER_KEY_ENC_IPV6_DST, /* struct in6_addr */ + TCA_FLOWER_KEY_ENC_IPV6_DST_MASK, /* struct in6_addr */ + TCA_FLOWER_KEY_ENC_KEY_ID, /* be32 */ + __TCA_FLOWER_MAX, }; diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index 5060801a2f6d..26436dd34e21 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -23,12 +23,18 @@ #include #include +#include +#include +#include + struct fl_flow_key { int indev_ifindex; struct flow_dissector_key_control control; struct flow_dissector_key_basic basic; struct flow_dissector_key_eth_addrs eth; struct flow_dissector_key_addrs ipaddrs; + struct flow_dissector_key_ipv4_addrs enc_ipv4; + struct flow_dissector_key_keyid enc_key_id; union { struct flow_dissector_key_ipv4_addrs ipv4; struct flow_dissector_key_ipv6_addrs ipv6; @@ -123,11 +129,27 @@ static int fl_classify(struct sk_buff *skb, const struct tcf_proto *tp, struct cls_fl_filter *f; struct fl_flow_key skb_key; struct fl_flow_key skb_mkey; + struct ip_tunnel_info *info; if (!atomic_read(&head->ht.nelems)) return -1; fl_clear_masked_range(&skb_key, &head->mask); + + info = skb_tunnel_info(skb); + if (info) { + struct ip_tunnel_key *key = &info->key; + netdev_err(skb->dev, "%s:%d saddr: %pI4, daddr: %pI4 vni: %d tos: %#x ttl: %#x src_port: %d dst_port: %d\n", + __func__, __LINE__, + &key->u.ipv4.src, &key->u.ipv4.dst, + be32_to_cpu(vxlan_tun_id_to_vni(key->tun_id)), + key->tos, key->ttl, + ntohs(key->tp_src), ntohs(key->tp_dst)); + skb_key.enc_ipv4.src = key->u.ipv4.src; + skb_key.enc_ipv4.dst = key->u.ipv4.dst; + skb_key.enc_key_id.keyid = vxlan_tun_id_to_vni(key->tun_id); + } + skb_key.indev_ifindex = skb->skb_iif; /* skb_flow_dissect() does not set n_proto in case an unknown protocol, * so do it rather here. @@ -293,6 +315,12 @@ static const struct nla_policy fl_policy[TCA_FLOWER_MAX + 1] = { [TCA_FLOWER_KEY_TCP_DST] = { .type = NLA_U16 }, [TCA_FLOWER_KEY_UDP_SRC] = { .type = NLA_U16 }, [TCA_FLOWER_KEY_UDP_DST] = { .type = NLA_U16 }, + + [TCA_FLOWER_KEY_ENC_IPV4_SRC] = { .type = NLA_U32 }, + [TCA_FLOWER_KEY_ENC_IPV4_SRC_MASK] = { .type = NLA_U32 }, + [TCA_FLOWER_KEY_ENC_IPV4_DST] = { .type = NLA_U32 }, + [TCA_FLOWER_KEY_ENC_IPV4_DST_MASK] = { .type = NLA_U32 }, + [TCA_FLOWER_KEY_ENC_KEY_ID] = { .type = NLA_U32 }, }; static void fl_set_key_val(struct nlattr **tb, @@ -373,6 +401,20 @@ static int fl_set_key(struct net *net, struct nlattr **tb, sizeof(key->tp.dst)); } + if (tb[TCA_FLOWER_KEY_ENC_IPV4_SRC] || + tb[TCA_FLOWER_KEY_ENC_IPV4_DST] || + tb[TCA_FLOWER_KEY_ENC_KEY_ID]) { + fl_set_key_val(tb, &key->enc_ipv4.src, TCA_FLOWER_KEY_ENC_IPV4_SRC, + &mask->enc_ipv4.src, TCA_FLOWER_KEY_ENC_IPV4_SRC_MASK, + sizeof(key->enc_ipv4.src)); + fl_set_key_val(tb, &key->enc_ipv4.dst, TCA_FLOWER_KEY_ENC_IPV4_DST, + &mask->enc_ipv4.dst, TCA_FLOWER_KEY_ENC_IPV4_DST_MASK, + sizeof(key->enc_ipv4.dst)); + fl_set_key_val(tb, &key->enc_key_id, TCA_FLOWER_KEY_ENC_KEY_ID, + &mask->enc_key_id, TCA_FLOWER_KEY_ENC_KEY_ID, + sizeof(key->enc_key_id)); + } + return 0; } @@ -753,6 +795,17 @@ static int fl_dump(struct net *net, struct tcf_proto *tp, unsigned long fh, sizeof(key->tp.dst)))) goto nla_put_failure; + if (fl_dump_key_val(skb, &key->enc_ipv4.src, TCA_FLOWER_KEY_ENC_IPV4_SRC, + &mask->enc_ipv4.src, TCA_FLOWER_KEY_ENC_IPV4_SRC_MASK, + sizeof(key->enc_ipv4.src)) || + fl_dump_key_val(skb, &key->enc_ipv4.dst, TCA_FLOWER_KEY_ENC_IPV4_DST, + &mask->enc_ipv4.dst, TCA_FLOWER_KEY_ENC_IPV4_DST_MASK, + sizeof(key->enc_ipv4.dst)) || + fl_dump_key_val(skb, &key->enc_key_id, TCA_FLOWER_KEY_ENC_KEY_ID, + &mask->enc_key_id, TCA_FLOWER_KEY_ENC_KEY_ID, + sizeof(key->enc_key_id))) + goto nla_put_failure; + nla_put_u32(skb, TCA_FLOWER_FLAGS, f->flags); if (tcf_exts_dump(skb, &f->exts))