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=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 906A6C83004 for ; Tue, 28 Apr 2020 05:24:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5E978206A1 for ; Tue, 28 Apr 2020 05:24:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TzPk+yNK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726309AbgD1FYw (ORCPT ); Tue, 28 Apr 2020 01:24:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726286AbgD1FYw (ORCPT ); Tue, 28 Apr 2020 01:24:52 -0400 Received: from mail-pj1-x1041.google.com (mail-pj1-x1041.google.com [IPv6:2607:f8b0:4864:20::1041]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0093AC03C1A9 for ; Mon, 27 Apr 2020 22:24:51 -0700 (PDT) Received: by mail-pj1-x1041.google.com with SMTP id ms17so627013pjb.0 for ; Mon, 27 Apr 2020 22:24:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Ka6vmyhY0AX4lRZI9H5dty+ruIfBXfAbXri68nGue6I=; b=TzPk+yNKNZQ/wcNexNWQbrZoqODqOMlgcqNzm7R4nCn7av34hsHyv1lfVGKDjomJmP 76TE2OTI54y8UEqCBbse/ZW0/q7xdFOsaZNDQEwihK7Jxn9rdE73ILvLR79/0br5e3h+ 5gNFtphnRbpYTSzfQrLouS7nwy1KUII4sYyR7h/j6D4nt/W7fBaq2ewWlLQjHZ3pWPhD WWkvCld6W/j+EtHKZsLs+fg5rrdog48e7/JEUkUCZUSFsUTWAbPx1ZlYEWVGLEd4fz9b xDQ8oRe8PI/XsbXw9ToDxTHngoe+plNsbgtPstrtV06zE+lhHVlj/LXB6/yyCfFXi15u kp3A== 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=Ka6vmyhY0AX4lRZI9H5dty+ruIfBXfAbXri68nGue6I=; b=hV2A4lh/H8WaXUa2zQvm2zHr2+U+3gdtenO46lYdVj/hcjvwEvL6dmpDvNcZGuGN7P QwK6730HDV4SX7n+P2Xb1fGEDP77oXr+kBONiDuS5X+3O0kO3Jzltbu6RYVWMT2ozjUL jIV69J9P8C+n992+BHLXU5yMVHAbiM6ebh8GQ5rkO6wQ+QWXWFve4VOo6QAsrXok5kYQ hJd+7BF+i08tSkE/5XAinP5LWnQISW4jgx06AfoP7+5VVFik9R/CodwBwguRehfT72P7 nG4qg+BAqLcFcXTssZBRsvwQuXUSQj/TzsUiGDCNHQCOfOffWbR6gQZLjay7pmZ4f0pD nGGw== X-Gm-Message-State: AGi0PuY1B9y0HvUvvetL1L5Cp+RgHV/y2wHBFTUApzQ4sGRLtbSbE6SG bHIouZO60nDGmYaRBIFUGnU= X-Google-Smtp-Source: APiQypKhwAQgmqhPbmHqg5OrcwWUBFJjfCklnXgljLyTHn4rlfWMBhZWel52Gv5zB9JTAIyxHXl56w== X-Received: by 2002:a17:902:d697:: with SMTP id v23mr24893565ply.262.1588051491378; Mon, 27 Apr 2020 22:24:51 -0700 (PDT) Received: from local.opencloud.tech.localdomain ([219.142.146.4]) by smtp.gmail.com with ESMTPSA id d8sm14093044pfd.159.2020.04.27.22.24.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Apr 2020 22:24:50 -0700 (PDT) From: xiangxia.m.yue@gmail.com To: paulb@mellanox.com, saeedm@mellanox.com, roid@mellanox.com, gerlitz.or@gmail.com Cc: netdev@vger.kernel.org, Tonghao Zhang Subject: [PATCH net-next 1/3] net/mlx5e: Implicitly decap the tunnel packet when necessary Date: Tue, 28 Apr 2020 13:24:13 +0800 Message-Id: <1588051455-42828-1-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tonghao Zhang The commit 0a7fcb78cc21 ("net/mlx5e: Support inner header rewrite with goto action"), will decapitate the tunnel packets if there is a goto action in chain 0. But in some case, we don't want do that, for example: $ tc filter add dev $VXLAN protocol ip parent ffff: prio 1 chain 0 \ flower enc_dst_ip 2.2.2.100 enc_dst_port 4789 \ action goto chain 2 $ tc filter add dev $VXLAN protocol ip parent ffff: prio 1 chain 2 \ flower dst_mac 00:11:22:33:44:55 enc_src_ip 2.2.2.200 \ enc_dst_ip 2.2.2.100 enc_dst_port 4789 enc_key_id 100 \ action tunnel_key unset action mirred egress redirect dev enp130s0f0_0 $ tc filter add dev $VXLAN protocol ip parent ffff: prio 1 chain 2 \ flower dst_mac 00:11:22:33:44:66 enc_src_ip 2.2.2.200 \ enc_dst_ip 2.2.2.100 enc_dst_port 4789 enc_key_id 200 \ action tunnel_key unset action mirred egress redirect dev enp130s0f0_1 In this patch, if there is a pedit action in chain, do the decapitation action. if there are pedit and goto actions, do the decapitation and id mapping action. 8 test units: [1]: $ tc filter add dev $VXLAN protocol ip parent ffff: prio 1 chain 0 \ flower enc_dst_ip 2.2.2.100 enc_dst_port 4789 \ action goto chain 2 $ tc filter add dev $VXLAN protocol ip parent ffff: prio 1 chain 2 \ flower enc_src_ip 2.2.2.200 enc_dst_ip 2.2.2.100 \ enc_dst_port 4789 enc_key_id 100 dst_mac 00:11:22:33:44:55 \ action tunnel_key unset \ action mirred egress redirect dev enp130s0f0_0 [2]: $ tc filter add dev $VXLAN protocol ip parent ffff: prio 1 chain 0 \ flower enc_dst_ip 2.2.2.100 enc_dst_port 4789 enc_key_id 100 \ action goto chain 2 $ tc filter add dev $VXLAN protocol ip parent ffff: prio 1 chain 2 \ flower enc_src_ip 2.2.2.200 enc_dst_ip 2.2.2.100 \ enc_dst_port 4789 enc_key_id 100 dst_mac 00:11:22:33:44:55 \ action pedit ex munge eth src set 00:11:22:33:44:f0 \ action mirred egress redirect dev enp130s0f0_0 [3]: $ tc filter add dev $VXLAN protocol ip parent ffff: prio 1 chain 0 \ flower enc_dst_ip 2.2.2.100 enc_dst_port 4789 enc_key_id 100 \ action goto chain 2 $ tc filter add dev $VXLAN protocol ip parent ffff: prio 1 chain 2 \ flower enc_src_ip 2.2.2.200 enc_dst_ip 2.2.2.100 \ enc_dst_port 4789 enc_key_id 100 dst_mac 00:11:22:33:44:55 \ action tunnel_key unset \ action pedit ex munge eth src set 00:11:22:33:44:f0 \ action mirred egress redirect dev enp130s0f0_0 [4]: $ tc filter add dev $VXLAN protocol ip parent ffff: prio 1 chain 0 \ flower enc_dst_ip 2.2.2.100 enc_dst_port 4789 \ enc_key_id 100 dst_mac 00:11:22:33:44:55 \ action pedit ex munge eth src set 00:11:22:33:44:ff pipe \ action mirred egress redirect dev enp130s0f0_0 [5]: $ tc filter add dev $VXLAN protocol ip parent ffff: prio 1 chain 0 \ flower enc_src_ip 2.2.2.200 enc_dst_ip 2.2.2.100 \ enc_dst_port 4789 enc_key_id 100 dst_mac 00:11:22:33:44:55 \ action pedit ex munge eth src set 00:11:22:33:44:ff \ action goto chain 2 $ tc filter add dev $VXLAN protocol ip parent ffff: prio 1 chain 2 \ flower enc_src_ip 2.2.2.200 enc_dst_ip 2.2.2.100 \ enc_dst_port 4789 enc_key_id 100 src_mac 00:11:22:33:44:ff \ action tunnel_key unset \ action mirred egress redirect dev enp130s0f0_0 [6]: $ tc filter add dev $VXLAN protocol ip parent ffff: prio 1 chain 0 \ flower enc_src_ip 2.2.2.200 enc_dst_ip 2.2.2.100 \ enc_dst_port 4789 enc_key_id 100 dst_mac 00:11:22:33:44:55 \ action pedit ex munge eth src set 00:11:22:33:44:ff \ action goto chain 2 $ tc filter add dev $VXLAN protocol ip parent ffff: prio 1 chain 2 \ flower enc_src_ip 2.2.2.200 enc_dst_ip 2.2.2.100 \ enc_dst_port 4789 enc_key_id 100 src_mac 00:11:22:33:44:ff \ action tunnel_key unset \ action pedit ex munge eth src set 00:11:22:33:44:f0 \ action mirred egress redirect dev enp130s0f0_0 [7]: $ tc filter add dev $VXLAN protocol ip parent ffff: prio 1 chain 0 \ flower enc_src_ip 2.2.2.200 enc_dst_ip 2.2.2.100 \ enc_dst_port 4789 enc_key_id 100 dst_mac 00:11:22:33:44:55 \ action pedit ex munge eth src set 00:11:22:33:44:ff \ action goto chain 2 $ tc filter add dev $VXLAN protocol ip parent ffff: prio 1 chain 2 \ flower enc_src_ip 2.2.2.200 enc_dst_ip 2.2.2.100 \ enc_dst_port 4789 enc_key_id 100 src_mac 00:11:22:33:44:ff \ action pedit ex munge eth src set 00:11:22:33:44:f0 \ action goto chain 3 $ tc filter add dev vxlan0 protocol ip parent ffff: prio 1 chain 3 \ flower enc_src_ip 2.2.2.200 enc_dst_ip 2.2.2.100 \ enc_dst_port 4789 enc_key_id 100 src_mac 00:11:22:33:44:f0 \ action tunnel_key unset \ action pedit ex munge eth src set 00:11:22:33:44:f1 \ action mirred egress redirect dev enp130s0f0_0 [8]: $ tc filter add dev $VXLAN protocol ip parent ffff: prio 1 chain 0 \ flower enc_dst_ip 2.2.2.100 enc_dst_port 4789 \ action goto chain 2 $ tc filter add dev $VXLAN protocol ip parent ffff: prio 1 chain 2 \ flower enc_src_ip 2.2.2.200 enc_dst_ip 2.2.2.100 \ enc_dst_port 4789 enc_key_id 100 dst_mac 00:11:22:33:44:55 \ action pedit ex munge eth src set 00:11:22:33:44:f0 \ action goto chain 3 $ tc filter add dev $VXLAN protocol ip parent ffff: prio 1 chain 3 \ flower enc_src_ip 2.2.2.200 enc_dst_ip 2.2.2.100 \ enc_dst_port 4789 enc_key_id 100 dst_mac 00:11:22:33:44:55 \ action pedit ex munge eth src set 00:11:22:33:44:f1 \ action goto chain 4 $ tc filter add dev $VXLAN protocol ip parent ffff: prio 1 chain 4 \ flower enc_src_ip 2.2.2.200 enc_dst_ip 2.2.2.100 \ enc_dst_port 4789 enc_key_id 100 dst_mac 00:11:22:33:44:55 \ action pedit ex munge eth src set 00:11:22:33:44:f2 \ action mirred egress redirect dev enp130s0f0_0 Signed-off-by: Tonghao Zhang --- .../net/ethernet/mellanox/mlx5/core/en/mapping.c | 24 ++++++ .../net/ethernet/mellanox/mlx5/core/en/mapping.h | 1 + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 97 +++++++++++++++------- 3 files changed, 92 insertions(+), 30 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/mapping.c b/drivers/net/ethernet/mellanox/mlx5/core/en/mapping.c index ea321e528749..90306dde6b60 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/mapping.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/mapping.c @@ -74,6 +74,30 @@ int mapping_add(struct mapping_ctx *ctx, void *data, u32 *id) return err; } +int mapping_find_by_data(struct mapping_ctx *ctx, void *data, u32 *id) +{ + struct mapping_item *mi; + u32 hash_key; + + mutex_lock(&ctx->lock); + + hash_key = jhash(data, ctx->data_size, 0); + hash_for_each_possible(ctx->ht, mi, node, hash_key) { + if (!memcmp(data, mi->data, ctx->data_size)) + goto found; + } + + mutex_unlock(&ctx->lock); + return -ENOENT; + +found: + if (id) + *id = mi->id; + + mutex_unlock(&ctx->lock); + return 0; +} + static void mapping_remove_and_free(struct mapping_ctx *ctx, struct mapping_item *mi) { diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/mapping.h b/drivers/net/ethernet/mellanox/mlx5/core/en/mapping.h index 285525cc5470..af501c9796b7 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/mapping.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/mapping.h @@ -9,6 +9,7 @@ int mapping_add(struct mapping_ctx *ctx, void *data, u32 *id); int mapping_remove(struct mapping_ctx *ctx, u32 id); int mapping_find(struct mapping_ctx *ctx, u32 id, void *data); +int mapping_find_by_data(struct mapping_ctx *ctx, void *data, u32 *id); /* mapping uses an xarray to map data to ids in add(), and for find(). * For locking, it uses a internal xarray spin lock for add()/remove(), diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c index a574c588269a..64f5c3f3dbb3 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -1786,7 +1786,8 @@ static void mlx5e_tc_del_flow(struct mlx5e_priv *priv, } } -static int flow_has_tc_fwd_action(struct flow_cls_offload *f) +static int flow_has_tc_action(struct flow_cls_offload *f, + enum flow_action_id action) { struct flow_rule *rule = flow_cls_offload_flow_rule(f); struct flow_action *flow_action = &rule->action; @@ -1794,12 +1795,8 @@ static int flow_has_tc_fwd_action(struct flow_cls_offload *f) int i; flow_action_for_each(i, act, flow_action) { - switch (act->id) { - case FLOW_ACTION_GOTO: + if (act->id == action) return true; - default: - continue; - } } return false; @@ -1853,10 +1850,37 @@ static int flow_has_tc_fwd_action(struct flow_cls_offload *f) sizeof(*__dst));\ }) +static void mlx5e_make_tunnel_match_key(struct flow_cls_offload *f, + struct net_device *filter_dev, + struct tunnel_match_key *tunnel_key) +{ + struct flow_rule *rule = flow_cls_offload_flow_rule(f); + + memset(tunnel_key, 0, sizeof(*tunnel_key)); + COPY_DISSECTOR(rule, FLOW_DISSECTOR_KEY_ENC_CONTROL, + &tunnel_key->enc_control); + if (tunnel_key->enc_control.addr_type == FLOW_DISSECTOR_KEY_IPV4_ADDRS) + COPY_DISSECTOR(rule, FLOW_DISSECTOR_KEY_ENC_IPV4_ADDRS, + &tunnel_key->enc_ipv4); + else + COPY_DISSECTOR(rule, FLOW_DISSECTOR_KEY_ENC_IPV6_ADDRS, + &tunnel_key->enc_ipv6); + + COPY_DISSECTOR(rule, FLOW_DISSECTOR_KEY_ENC_IP, &tunnel_key->enc_ip); + COPY_DISSECTOR(rule, FLOW_DISSECTOR_KEY_ENC_PORTS, + &tunnel_key->enc_tp); + COPY_DISSECTOR(rule, FLOW_DISSECTOR_KEY_ENC_KEYID, + &tunnel_key->enc_key_id); + + tunnel_key->filter_ifindex = filter_dev->ifindex; +} + static int mlx5e_get_flow_tunnel_id(struct mlx5e_priv *priv, struct mlx5e_tc_flow *flow, struct flow_cls_offload *f, - struct net_device *filter_dev) + struct net_device *filter_dev, + bool sets_mapping, + bool needs_mapping) { struct flow_rule *rule = flow_cls_offload_flow_rule(f); struct netlink_ext_ack *extack = f->common.extack; @@ -1876,22 +1900,7 @@ static int mlx5e_get_flow_tunnel_id(struct mlx5e_priv *priv, uplink_rpriv = mlx5_eswitch_get_uplink_priv(esw, REP_ETH); uplink_priv = &uplink_rpriv->uplink_priv; - memset(&tunnel_key, 0, sizeof(tunnel_key)); - COPY_DISSECTOR(rule, FLOW_DISSECTOR_KEY_ENC_CONTROL, - &tunnel_key.enc_control); - if (tunnel_key.enc_control.addr_type == FLOW_DISSECTOR_KEY_IPV4_ADDRS) - COPY_DISSECTOR(rule, FLOW_DISSECTOR_KEY_ENC_IPV4_ADDRS, - &tunnel_key.enc_ipv4); - else - COPY_DISSECTOR(rule, FLOW_DISSECTOR_KEY_ENC_IPV6_ADDRS, - &tunnel_key.enc_ipv6); - COPY_DISSECTOR(rule, FLOW_DISSECTOR_KEY_ENC_IP, &tunnel_key.enc_ip); - COPY_DISSECTOR(rule, FLOW_DISSECTOR_KEY_ENC_PORTS, - &tunnel_key.enc_tp); - COPY_DISSECTOR(rule, FLOW_DISSECTOR_KEY_ENC_KEYID, - &tunnel_key.enc_key_id); - tunnel_key.filter_ifindex = filter_dev->ifindex; - + mlx5e_make_tunnel_match_key(f, filter_dev, &tunnel_key); err = mapping_add(uplink_priv->tunnel_mapping, &tunnel_key, &tun_id); if (err) return err; @@ -1915,10 +1924,10 @@ static int mlx5e_get_flow_tunnel_id(struct mlx5e_priv *priv, mask = enc_opts_id ? TUNNEL_ID_MASK : (TUNNEL_ID_MASK & ~ENC_OPTS_BITS_MASK); - if (attr->chain) { + if (needs_mapping) { mlx5e_tc_match_to_reg_match(&attr->parse_attr->spec, TUNNEL_TO_REG, value, mask); - } else { + } else if (sets_mapping) { mod_hdr_acts = &attr->parse_attr->mod_hdr_acts; err = mlx5e_tc_match_to_reg_set(priv->mdev, mod_hdr_acts, @@ -1941,6 +1950,25 @@ static int mlx5e_get_flow_tunnel_id(struct mlx5e_priv *priv, return err; } +static int mlx5e_lookup_flow_tunnel_id(struct mlx5e_priv *priv, + struct mlx5e_tc_flow *flow, + struct flow_cls_offload *f, + struct net_device *filter_dev, + u32 *tun_id) +{ + struct mlx5_rep_uplink_priv *uplink_priv; + struct mlx5e_rep_priv *uplink_rpriv; + struct tunnel_match_key tunnel_key; + struct mlx5_eswitch *esw; + + esw = priv->mdev->priv.eswitch; + uplink_rpriv = mlx5_eswitch_get_uplink_priv(esw, REP_ETH); + uplink_priv = &uplink_rpriv->uplink_priv; + + mlx5e_make_tunnel_match_key(f, filter_dev, &tunnel_key); + return mapping_find_by_data(uplink_priv->tunnel_mapping, &tunnel_key, tun_id); +} + static void mlx5e_put_flow_tunnel_id(struct mlx5e_tc_flow *flow) { u32 enc_opts_id = flow->tunnel_id & ENC_OPTS_BITS_MASK; @@ -1976,14 +2004,22 @@ static int parse_tunnel_attr(struct mlx5e_priv *priv, struct mlx5_eswitch *esw = priv->mdev->priv.eswitch; struct netlink_ext_ack *extack = f->common.extack; bool needs_mapping, sets_mapping; + bool pedit_action; int err; if (!mlx5e_is_eswitch_flow(flow)) return -EOPNOTSUPP; - needs_mapping = !!flow->esw_attr->chain; - sets_mapping = !flow->esw_attr->chain && flow_has_tc_fwd_action(f); - *match_inner = !needs_mapping; + pedit_action = flow_has_tc_action(f, FLOW_ACTION_MANGLE) || + flow_has_tc_action(f, FLOW_ACTION_ADD); + + *match_inner = pedit_action; + sets_mapping = pedit_action && + flow_has_tc_action(f, FLOW_ACTION_GOTO); + + needs_mapping = !!flow->esw_attr->chain && + !mlx5e_lookup_flow_tunnel_id(priv, flow, f, + filter_dev, NULL); if ((needs_mapping || sets_mapping) && !mlx5_eswitch_reg_c1_loopback_enabled(esw)) { @@ -1994,7 +2030,7 @@ static int parse_tunnel_attr(struct mlx5e_priv *priv, return -EOPNOTSUPP; } - if (!flow->esw_attr->chain) { + if (*match_inner && !needs_mapping) { err = mlx5e_tc_tun_parse(filter_dev, priv, spec, f, match_level); if (err) { @@ -2011,7 +2047,8 @@ static int parse_tunnel_attr(struct mlx5e_priv *priv, if (!needs_mapping && !sets_mapping) return 0; - return mlx5e_get_flow_tunnel_id(priv, flow, f, filter_dev); + return mlx5e_get_flow_tunnel_id(priv, flow, f, filter_dev, + sets_mapping, needs_mapping); } static void *get_match_inner_headers_criteria(struct mlx5_flow_spec *spec) -- 1.8.3.1