From patchwork Wed Jan 16 11:45:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1026397 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AeIASJ+2"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43g92t5nYsz9sD9 for ; Thu, 17 Jan 2019 14:45:42 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728268AbfAQDpk (ORCPT ); Wed, 16 Jan 2019 22:45:40 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:39011 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727973AbfAQDpk (ORCPT ); Wed, 16 Jan 2019 22:45:40 -0500 Received: by mail-pf1-f195.google.com with SMTP id r136so4120477pfc.6 for ; Wed, 16 Jan 2019 19:45:39 -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; bh=gVgh0FEy9SZFszEplt0AWSdeN9mwCDW3Px1pMaR+OfU=; b=AeIASJ+2tq4ss0Tamqkw0xME7jhZ3uiewdNQClrE6FyzUvBZzSkNpgFLHlBKkkCjLX l2eafw66kT2H+pxLkpSwYdCy9kcbSAvZxAK23yvw2sHgDmRzrzLbkmkPnjjG0rgXSh/X GkvObikOjX+PuJlQ/cDsRbk9JPNWcx57zpvZXsISC+9xvZwRO5WC+e1VLI5/1lRyX9/e dg71I74yEvE6vfsMRz3xpb9MJPtBzuiwjo7bwJjXeOLzq02WxryvBi63bHkIoVihGF7T RIqozDX6fMbarQMpQ8kLrkx4LeZEPsw/Hfd5ngKShVo54M4yuf67gku12eJqKF93AL7e oqfw== 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=gVgh0FEy9SZFszEplt0AWSdeN9mwCDW3Px1pMaR+OfU=; b=qFFYtLLkaXZsV4hHZSQHg/jaOaS0bcWmZfjBUBRknuUsdOl+vOlgeDYSo7DxOtx/xP nYIJ6XF0aGGhd5pe+tNfygpZyWeQrlxbee3xMNOCwEQ1nak8heQGR9cZzIQ7dvS0iPJq /l7v6he3qR2drSB5Ye79JEWYvNXLQhcEDtVmFIACZfY6IpD+Y6ZQLz8ln8smD3FZ0lIk ou9kaH38k7tM76O3cTXoIxx0voM7n2pN9QK452OKNjvo10bytXMaP10XhZq95wvG3CcH RHmcglrusK+hGSUM5khLimanl1WurTiaIjub96EBaOPM7+WzSlF4gDQS33202GBne4k2 J++A== X-Gm-Message-State: AJcUukfTQgPDoFrE6kb1fDGHupl96A/S9z1lxKrH5fZRwioQ/WfLNFMI knYa586+1vkpQvtvL5vQus0= X-Google-Smtp-Source: ALg8bN7qUKPoqgUdCAJopl/J9OMxumxn8LlW0WnVC9DJcRX9ttSvj0YYHiR1kso7a56+gxJSGaUdjQ== X-Received: by 2002:aa7:8608:: with SMTP id p8mr13430254pfn.125.1547696739481; Wed, 16 Jan 2019 19:45:39 -0800 (PST) Received: from local.opencloud.tech.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id o13sm376524pfk.57.2019.01.16.19.45.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 19:45:38 -0800 (PST) From: xiangxia.m.yue@gmail.com To: ogerlitz@mellanox.com, saeedm@mellanox.com, leonro@mellanox.com Cc: netdev@vger.kernel.org, Tonghao Zhang Subject: [PATCH] net: mlx5: don't overwrite pedit action when multiple pedit used Date: Wed, 16 Jan 2019 03:45:47 -0800 Message-Id: <1547639147-14395-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 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 struct, 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)