From patchwork Wed Feb 27 15:31:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1049574 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="YYhckYcR"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 449G6F1k1qz9s1b for ; Fri, 1 Mar 2019 02:04:05 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731552AbfB1PEE (ORCPT ); Thu, 28 Feb 2019 10:04:04 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:35672 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726027AbfB1PED (ORCPT ); Thu, 28 Feb 2019 10:04:03 -0500 Received: by mail-pf1-f194.google.com with SMTP id j5so9863561pfa.2 for ; Thu, 28 Feb 2019 07:04:02 -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=aYz8zfhzfh4yI7rZseBu40C0cDBDi4DsK4D8WzX+GYc=; b=YYhckYcRfW9+b0rcfay4eKyt96aPnHPuZr5MKvfPFWVjqxVCPVMKE7UmMfB6YR72Bg 2l7kOWDE4KuwsWrEBDbuvby9Y5XKAZBnUGEeZmggtwvJEfyXRkbss2JRDmUzs3ky4ips +glZ8ykViza6WQrphJadxxdbc6kH9yTmDWRY6bziWYo/x0btu7EvYxOJTH6PzKeHYqjm 2pdEKLyAXoMs61YeWLTUfj06TWMK+DISo6xvSucAYZgDDzLG62McIHqW2AQarL4uDq1x Ogv1TmU6FISnKLAceVkkpZOVv4R/UpnTRl6i3gzBJLFYxI88C/mn1yUOt7ggaiJqvN9K wEsQ== 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=aYz8zfhzfh4yI7rZseBu40C0cDBDi4DsK4D8WzX+GYc=; b=ZMoBsPpq4pqV8DcyXnj7xix9fB/vjxtVsnp1UiNtEMONQzTPkN+kgQgaMk5ZeOwz5J unD+S4m970xmLe02l8sKCCZMGUb69+H6e3q2ArIEDYIuWXR4Su51fgf2SbLsSbeKyBa1 l8zZahomOrSnO3bUiEeDBpS1tjkdOUjiz88EzYPaL8pt/z/hDUmGb3vlHM4CmE6buC0M LEbtMN5luB6uR6uprNvQJi61y8aAR7wX5QhEStMFlDAJF99c/xlpUGUzGg+4Vw0yZJpH TeKhzEjHmNWp3I2cYZEPFxhxpPYjz73aGeIZ7bXwDKH4g5ZnEm13kIHg4UpXXKnRxAfV 3e+w== X-Gm-Message-State: AHQUAuaq9QR4pn+/pupzVzwR5EzqlTeUY/SAHLbhqOvlixhTNaXDvOjz 7jYMJ+tIy927ck5x3HaHoERd6BBO X-Google-Smtp-Source: AHgI3IabmIA08bBjajesepk3X/z/G8M53xzD6EinMr7uct9bkdsxOpGO20ExjoM/1m3SD3GlFApdfA== X-Received: by 2002:a63:4542:: with SMTP id u2mr8766900pgk.291.1551366242206; Thu, 28 Feb 2019 07:04:02 -0800 (PST) Received: from local.opencloud.tech.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id 186sm37081953pga.36.2019.02.28.07.03.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Feb 2019 07:04:01 -0800 (PST) From: xiangxia.m.yue@gmail.com To: saeedm@mellanox.com, gerlitz.or@gmail.com, roid@mellanox.com Cc: netdev@vger.kernel.org, Tonghao Zhang Subject: [PATCH net-next v4 4/4] net/mlx5e: Return -EOPNOTSUPP when attempting to offload an unsupported action Date: Wed, 27 Feb 2019 07:31:19 -0800 Message-Id: <1551281479-69243-5-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1551281479-69243-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1551281479-69243-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 * Now the encapsulation is not supported for mlx5 VFs. When we try to offload that action, the -EINVAL is returned, but not -EOPNOTSUPP. This patch changes the returned value and ignore to confuse user. The command is shown as below [1]. * When max modify header action is zero, we return -EOPNOTSUPP directly. In this way, we can ignore wrong message info (e.g. "mlx5: parsed 0 pedit actions, can't do more"). This happens when offloading pedit actions on mlx(cx4) VFs. The command is shown as below [2]. For example: (p2p1_0 is VF net device) [1] $ tc filter add dev p2p1_0 protocol ip parent ffff: prio 1 flower skip_sw \ src_mac e4:11:22:33:44:01 \ 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 [2] $ tc filter add dev p2p1_0 parent ffff: protocol ip prio 1 \ flower skip_sw dst_mac 00:10:56:fb:64:e8 \ dst_ip 1.1.1.100 src_ip 1.1.1.200 \ action pedit ex munge eth src set 00:10:56:b4:5d:20 Signed-off-by: Tonghao Zhang Reviewed-by: Roi Dayan --- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 27 ++++++++++++++++++------- 1 file changed, 20 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 56ac50d..52748e2 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -1999,6 +1999,15 @@ static int offload_pedit_fields(struct pedit_headers_action *hdrs, return 0; } +static int mlx5e_flow_namespace_max_modify_action(struct mlx5_core_dev *mdev, + int namespace) +{ + if (namespace == MLX5_FLOW_NAMESPACE_FDB) /* FDB offloading */ + return MLX5_CAP_ESW_FLOWTABLE_FDB(mdev, max_modify_header_actions); + else /* namespace is MLX5_FLOW_NAMESPACE_KERNEL - NIC offloading */ + return MLX5_CAP_FLOWTABLE_NIC_RX(mdev, max_modify_header_actions); +} + static int alloc_mod_hdr_actions(struct mlx5e_priv *priv, struct pedit_headers_action *hdrs, int namespace, @@ -2010,11 +2019,7 @@ static int alloc_mod_hdr_actions(struct mlx5e_priv *priv, hdrs[TCA_PEDIT_KEY_EX_CMD_ADD].pedits; action_size = MLX5_UN_SZ_BYTES(set_action_in_add_action_in_auto); - if (namespace == MLX5_FLOW_NAMESPACE_FDB) /* FDB offloading */ - max_actions = MLX5_CAP_ESW_FLOWTABLE_FDB(priv->mdev, max_modify_header_actions); - else /* namespace is MLX5_FLOW_NAMESPACE_KERNEL - NIC offloading */ - max_actions = MLX5_CAP_FLOWTABLE_NIC_RX(priv->mdev, max_modify_header_actions); - + max_actions = mlx5e_flow_namespace_max_modify_action(priv->mdev, namespace); /* can get up to crazingly 16 HW actions in 32 bits pedit SW key */ max_actions = min(max_actions, nkeys * 16); @@ -2047,6 +2052,12 @@ static int parse_tc_pedit_action(struct mlx5e_priv *priv, goto out_err; } + if (!mlx5e_flow_namespace_max_modify_action(priv->mdev, namespace)) { + NL_SET_ERR_MSG_MOD(extack, + "The pedit offload action is not supported"); + goto out_err; + } + mask = act->mangle.mask; val = act->mangle.val; offset = act->mangle.offset; @@ -2294,7 +2305,8 @@ static int parse_tc_nic_actions(struct mlx5e_priv *priv, } break; default: - return -EINVAL; + NL_SET_ERR_MSG_MOD(extack, "The offload action is not supported"); + return -EOPNOTSUPP; } } @@ -2616,7 +2628,8 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv, break; } default: - return -EINVAL; + NL_SET_ERR_MSG_MOD(extack, "The offload action is not supported"); + return -EOPNOTSUPP; } }