From patchwork Mon Mar 12 12:58:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roi Dayan X-Patchwork-Id: 884484 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=mellanox.com Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 400J444FvMz9s78 for ; Tue, 13 Mar 2018 00:00:04 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 359E5FA7; Mon, 12 Mar 2018 12:58:59 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 02B16F29 for ; Mon, 12 Mar 2018 12:58:56 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by smtp1.linuxfoundation.org (Postfix) with ESMTP id C74BD356 for ; Mon, 12 Mar 2018 12:58:54 +0000 (UTC) Received: from Internal Mail-Server by MTLPINE1 (envelope-from roid@mellanox.com) with ESMTPS (AES256-SHA encrypted); 12 Mar 2018 14:59:25 +0200 Received: from r-vnc11.mtr.labs.mlnx (r-vnc11.mtr.labs.mlnx [10.208.0.123]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id w2CCwo25003101; Mon, 12 Mar 2018 14:58:50 +0200 From: Roi Dayan To: dev@openvswitch.org Date: Mon, 12 Mar 2018 14:58:47 +0200 Message-Id: <1520859527-9134-3-git-send-email-roid@mellanox.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1520859527-9134-1-git-send-email-roid@mellanox.com> References: <1520859527-9134-1-git-send-email-roid@mellanox.com> X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Simon Horman , Shahar Klein Subject: [ovs-dev] [PATCH V1 2/2] netdev-tc-offloads: Add support for IP fragmentation X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Add support for frag no, first and later. Signed-off-by: Roi Dayan Reviewed-by: Shahar Klein Reviewed-by: Paul Blakey --- acinclude.m4 | 6 +++--- include/linux/pkt_cls.h | 5 +++-- lib/netdev-tc-offloads.c | 38 ++++++++++++++++++++++++++++++++------ lib/tc.c | 14 ++++++++++++++ lib/tc.h | 1 + 5 files changed, 53 insertions(+), 11 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index d61e37a..dd264b3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -178,10 +178,10 @@ dnl Configure Linux tc compat. AC_DEFUN([OVS_CHECK_LINUX_TC], [ AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([#include ], [ - int x = TCA_FLOWER_KEY_IP_TTL_MASK; + int x = TCA_FLOWER_KEY_FLAGS_FRAG_IS_FIRST; ])], - [AC_DEFINE([HAVE_TCA_FLOWER_KEY_IP_TTL_MASK], [1], - [Define to 1 if TCA_FLOWER_KEY_IP_TTL_MASK is avaiable.])]) + [AC_DEFINE([HAVE_TCA_FLOWER_KEY_FLAGS_FRAG_IS_FIRST], [1], + [Define to 1 if TCA_FLOWER_KEY_FLAGS_FRAG_IS_FIRST is avaiable.])]) AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([#include ], [ diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h index f7bc7ea..60976f3 100644 --- a/include/linux/pkt_cls.h +++ b/include/linux/pkt_cls.h @@ -1,7 +1,7 @@ #ifndef __LINUX_PKT_CLS_WRAPPER_H #define __LINUX_PKT_CLS_WRAPPER_H 1 -#if defined(__KERNEL__) || defined(HAVE_TCA_FLOWER_KEY_IP_TTL_MASK) +#if defined(__KERNEL__) || defined(HAVE_TCA_FLOWER_KEY_FLAGS_FRAG_IS_FIRST) #include_next #else @@ -201,8 +201,9 @@ enum { enum { TCA_FLOWER_KEY_FLAGS_IS_FRAGMENT = (1 << 0), + TCA_FLOWER_KEY_FLAGS_FRAG_IS_FIRST = (1 << 1), }; -#endif /* __KERNEL__ || !HAVE_TCA_FLOWER_KEY_IP_TTL_MASK */ +#endif /* __KERNEL__ || !HAVE_TCA_FLOWER_KEY_FLAGS_FRAG_IS_FIRST */ #endif /* __LINUX_PKT_CLS_WRAPPER_H */ diff --git a/lib/netdev-tc-offloads.c b/lib/netdev-tc-offloads.c index 9364d94..f22415e 100644 --- a/lib/netdev-tc-offloads.c +++ b/lib/netdev-tc-offloads.c @@ -428,6 +428,27 @@ parse_tc_flower_to_match(struct tc_flower *flower, match_set_nw_ttl_masked(match, key->ip_ttl, mask->ip_ttl); + if (mask->flags) { + uint8_t flags = 0; + uint8_t flags_mask = 0; + + if (mask->flags & TCA_FLOWER_KEY_FLAGS_IS_FRAGMENT) { + if (key->flags & TCA_FLOWER_KEY_FLAGS_IS_FRAGMENT) { + flags |= FLOW_NW_FRAG_ANY; + } + flags_mask |= FLOW_NW_FRAG_ANY; + } + + if (mask->flags & TCA_FLOWER_KEY_FLAGS_FRAG_IS_FIRST) { + if (!(key->flags & TCA_FLOWER_KEY_FLAGS_FRAG_IS_FIRST)) { + flags |= FLOW_NW_FRAG_LATER; + } + flags_mask |= FLOW_NW_FRAG_LATER; + } + + match_set_nw_frag_masked(match, flags, flags_mask); + } + match_set_nw_src_masked(match, key->ipv4.ipv4_src, mask->ipv4.ipv4_src); match_set_nw_dst_masked(match, key->ipv4.ipv4_dst, mask->ipv4.ipv4_dst); @@ -780,11 +801,6 @@ test_key_and_mask(struct match *match) return EOPNOTSUPP; } - if (mask->nw_frag) { - VLOG_DBG_RL(&rl, "offloading attribute nw_frag isn't supported"); - return EOPNOTSUPP; - } - for (int i = 0; i < FLOW_MAX_MPLS_LABELS; i++) { if (mask->mpls_lse[i]) { VLOG_DBG_RL(&rl, "offloading attribute mpls_lse isn't supported"); @@ -932,6 +948,17 @@ netdev_tc_flow_put(struct netdev *netdev, struct match *match, flower.key.ip_ttl = key->nw_ttl; flower.mask.ip_ttl = mask->nw_ttl; + if (mask->nw_frag) { + if (key->nw_frag & FLOW_NW_FRAG_ANY) + flower.key.flags |= TCA_FLOWER_KEY_FLAGS_IS_FRAGMENT; + if (!(key->nw_frag & FLOW_NW_FRAG_LATER)) + flower.key.flags |= TCA_FLOWER_KEY_FLAGS_FRAG_IS_FIRST; + + flower.mask.flags |= TCA_FLOWER_KEY_FLAGS_IS_FRAGMENT; + flower.mask.flags |= TCA_FLOWER_KEY_FLAGS_FRAG_IS_FIRST; + mask->nw_frag = 0; + } + if (key->nw_proto == IPPROTO_TCP) { flower.key.tcp_dst = key->tp_dst; flower.mask.tcp_dst = mask->tp_dst; @@ -958,7 +985,6 @@ netdev_tc_flow_put(struct netdev *netdev, struct match *match, mask->tp_dst = 0; } - mask->nw_frag = 0; mask->nw_tos = 0; mask->nw_proto = 0; mask->nw_ttl = 0; diff --git a/lib/tc.c b/lib/tc.c index b49bbe8..c446d84 100644 --- a/lib/tc.c +++ b/lib/tc.c @@ -281,6 +281,8 @@ static const struct nl_policy tca_flower_policy[] = { .optional = true, }, [TCA_FLOWER_KEY_ENC_UDP_DST_PORT] = { .type = NL_A_U16, .optional = true, }, + [TCA_FLOWER_KEY_FLAGS] = { .type = NL_A_BE32, .optional = true, }, + [TCA_FLOWER_KEY_FLAGS_MASK] = { .type = NL_A_BE32, .optional = true, }, [TCA_FLOWER_KEY_IP_TTL] = { .type = NL_A_U8, .optional = true, }, [TCA_FLOWER_KEY_IP_TTL_MASK] = { .type = NL_A_U8, @@ -374,6 +376,11 @@ nl_parse_flower_ip(struct nlattr **attrs, struct tc_flower *flower) { mask->ip_proto = UINT8_MAX; } + if (attrs[TCA_FLOWER_KEY_FLAGS_MASK]) { + key->flags = ntohl(nl_attr_get_u32(attrs[TCA_FLOWER_KEY_FLAGS])); + mask->flags = ntohl(nl_attr_get_u32(attrs[TCA_FLOWER_KEY_FLAGS_MASK])); + } + if (attrs[TCA_FLOWER_KEY_IPV4_SRC_MASK]) { key->ipv4.ipv4_src = nl_attr_get_be32(attrs[TCA_FLOWER_KEY_IPV4_SRC]); @@ -1495,6 +1502,13 @@ nl_msg_put_flower_options(struct ofpbuf *request, struct tc_flower *flower) flower->key.ip_proto); } + if (flower->mask.flags) { + nl_msg_put_u32(request, TCA_FLOWER_KEY_FLAGS, + htonl(flower->key.flags)); + nl_msg_put_u32(request, TCA_FLOWER_KEY_FLAGS_MASK, + htonl(flower->mask.flags)); + } + if (flower->key.ip_proto == IPPROTO_UDP) { FLOWER_PUT_MASKED_VALUE(udp_src, TCA_FLOWER_KEY_UDP_SRC); FLOWER_PUT_MASKED_VALUE(udp_dst, TCA_FLOWER_KEY_UDP_DST); diff --git a/lib/tc.h b/lib/tc.h index 6af51c6..4400a82 100644 --- a/lib/tc.h +++ b/lib/tc.h @@ -92,6 +92,7 @@ struct tc_flower_key { ovs_be16 encap_eth_type; + uint8_t flags; uint8_t ip_ttl; struct {