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.0 required=3.0 tests=DATE_IN_PAST_03_06, 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_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 309D2C282C3 for ; Tue, 22 Jan 2019 14:38:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EC30020854 for ; Tue, 22 Jan 2019 14:38:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="r+LcP/CJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728809AbfAVOib (ORCPT ); Tue, 22 Jan 2019 09:38:31 -0500 Received: from mail-pl1-f194.google.com ([209.85.214.194]:39872 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728751AbfAVOi3 (ORCPT ); Tue, 22 Jan 2019 09:38:29 -0500 Received: by mail-pl1-f194.google.com with SMTP id 101so11574305pld.6 for ; Tue, 22 Jan 2019 06:38:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mFeB1bSxLcsrYUjSXRVAUJKWk+aJZ8IN5kwHC3dKRZc=; b=r+LcP/CJbvuE4Me+XPgxhh2X4SZt42wtUCg9WFgveGGa7tjkIzOoqkm4WdLsZUoSRq jQuNRrMWxqWiyrJM4LB5auXp+kBUjQTriLNaQOfTQfqATLNp+k508IgOReU93KDVB1vj Hwlonw4TL1CEtLBqEEez+bu758/qqEHRoNwNotIyuBGz4gVPaEBIMxCnDJM8wfdhjFvX IwedCTSrQZ+7AMUAdpsaYiWatIk/8XUHG0YX+KCeLS/i9giLodYP5vK/uPKK7a2bCRGW kZWUuz284+DF3nVxf2PS74X8WJZh+BadnWMmwOJir4XSfZAWWOCgwyCIxMTG5wwmMecc W/7g== 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=mFeB1bSxLcsrYUjSXRVAUJKWk+aJZ8IN5kwHC3dKRZc=; b=arfEC3QJECBDvUnqCKSagnB5P+CM05K0VBh2GYEKrPeOHwgrYCyYY9NCXwJjomJNIa cV8AuoJ6rgU6OjUXNplcWSl/v32nK2z61buV0Cjo/J7Oi6e6bYWsYeN+26uSXWcP3gH/ MjlnbHZ0rGpexN/2psbMtU1etNS5yNUYoyvMZOY+WC2+qmmpaybXgBCzTU1o5I1/Hbxh LFGxdDyGbxSmG87kb+f/2i4/TCmok+Z2VbEwvNSvACtVrHyeSKj0e3uxo++akp4VyN1F TqAwTXMVWYrHnG66JqqK0GcNYXPYoJ946XRTsFXrXCvdnwhaEiHYA79haYFCzc2MS8It r5PA== X-Gm-Message-State: AJcUukf60j/06NrS7hnNli28bBDJIzBsZPNQkj1SgNn/dnc9ArifYZ5Q nRtAq4qTmd0/eGFNg+9edcEpSG0VW0A= X-Google-Smtp-Source: ALg8bN6G7Nud1tRvYJtui+S1xx/T6rtW3Bqr0viiAWv6JolEipuukdwLTM5GFwT4jX/XLfh2ZO9zxg== X-Received: by 2002:a17:902:9692:: with SMTP id n18mr35077331plp.333.1548167908374; Tue, 22 Jan 2019 06:38:28 -0800 (PST) Received: from local.opencloud.tech.localdomain ([1.202.68.9]) by smtp.gmail.com with ESMTPSA id t13sm18965887pgr.42.2019.01.22.06.38.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Jan 2019 06:38:27 -0800 (PST) From: xiangxia.m.yue@gmail.com To: saeedm@mellanox.com, gerlitz.or@gmail.com Cc: netdev@vger.kernel.org, Tonghao Zhang Subject: [PATCH net-next v3 2/2] net/mlx5e: Don't overwrite pedit action when multiple pedit used Date: Tue, 22 Jan 2019 03:22:06 -0800 Message-Id: <1548156126-8021-2-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548156126-8021-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1548156126-8021-1-git-send-email-xiangxia.m.yue@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tonghao Zhang In some case, we may use multiple pedit actions to modify packets. The command shown as below: the last pedit action is effective. $ tc filter add dev netdev_rep parent ffff: protocol ip prio 1 \ flower skip_sw ip_proto icmp dst_ip 3.3.3.3 \ action pedit ex munge ip dst set 192.168.1.100 pipe \ action pedit ex munge eth src set 00:00:00:00:00:01 pipe \ action pedit ex munge eth dst set 00:00:00:00:00:02 pipe \ action csum ip pipe \ action tunnel_key set src_ip 1.1.1.100 dst_ip 1.1.1.200 dst_port 4789 id 100 \ action mirred egress redirect dev vxlan0 To fix it, we add max_mod_hdr_actions to mlx5e_tc_flow_parse_attr struction, max_mod_hdr_actions will store the max pedit action number we support and num_mod_hdr_actions indicates how many pedit action we used, and store all pedit action to mod_hdr_actions. Signed-off-by: Tonghao Zhang --- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c index cae6c6d..2ee377a 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -128,6 +128,7 @@ struct mlx5e_tc_flow_parse_attr { struct net_device *filter_dev; struct mlx5_flow_spec spec; int num_mod_hdr_actions; + int max_mod_hdr_actions; void *mod_hdr_actions; int mirred_ifindex[MLX5_MAX_FLOW_FWD_VPORTS]; }; @@ -1960,8 +1961,9 @@ static int offload_pedit_fields(struct pedit_headers *masks, add_vals = &vals[TCA_PEDIT_KEY_EX_CMD_ADD]; action_size = MLX5_UN_SZ_BYTES(set_action_in_add_action_in_auto); - action = parse_attr->mod_hdr_actions; - max_actions = parse_attr->num_mod_hdr_actions; + action = parse_attr->mod_hdr_actions + + parse_attr->num_mod_hdr_actions * action_size; + max_actions = parse_attr->max_mod_hdr_actions; nactions = 0; for (i = 0; i < ARRAY_SIZE(fields); i++) { @@ -2048,7 +2050,7 @@ static int offload_pedit_fields(struct pedit_headers *masks, nactions++; } - parse_attr->num_mod_hdr_actions = nactions; + parse_attr->num_mod_hdr_actions += nactions; return 0; } @@ -2073,7 +2075,8 @@ static int alloc_mod_hdr_actions(struct mlx5e_priv *priv, if (!parse_attr->mod_hdr_actions) return -ENOMEM; - parse_attr->num_mod_hdr_actions = max_actions; + parse_attr->max_mod_hdr_actions = max_actions; + parse_attr->num_mod_hdr_actions = 0; return 0; } @@ -2119,9 +2122,11 @@ static int parse_tc_pedit_action(struct mlx5e_priv *priv, goto out_err; } - err = alloc_mod_hdr_actions(priv, a, namespace, parse_attr); - if (err) - goto out_err; + if (!parse_attr->mod_hdr_actions) { + err = alloc_mod_hdr_actions(priv, a, namespace, parse_attr); + if (err) + goto out_err; + } err = offload_pedit_fields(masks, vals, parse_attr, extack); if (err < 0) -- 1.8.3.1