From patchwork Tue Feb 26 12:27:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1048869 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="MuzdFafk"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 448b5f4mytz9s4Y for ; Wed, 27 Feb 2019 23:46:14 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730172AbfB0MqN (ORCPT ); Wed, 27 Feb 2019 07:46:13 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:35067 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726419AbfB0MqN (ORCPT ); Wed, 27 Feb 2019 07:46:13 -0500 Received: by mail-pg1-f193.google.com with SMTP id e17so5877796pgd.2 for ; Wed, 27 Feb 2019 04:46:12 -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=Au5vlW0/T/UVsvKsDSVoNHoCDSTmkuAehtL6M83B73A=; b=MuzdFafkMeJ2bXNwfjJCy3CE1utmb1aEZ0QdqHCYgk0cZSyB9xscKRgusL1FRe8Eea vu5pitdpxYjWcNAW6CHhItE+DJRk7XS1Y5SYsA4mLM6ksWK64/ynRfhCc14vemrD76fH jc7IqxpvHpzR04HSOtJBmd5qJCDLttayNMY7Q8mIF8J3ymN3xt62w5LfgDexEOizjFk9 pcD68GDDSMrw/2sTKOvD/2pRPxuFfECWycmBQ4mM+hPV9b4aWtUO0IBXI/GKpP2LUA6Z 7eTZ5DlIAuGqHPKKfCBDhqdVl9oeN3G916lAElALdbtBjRZgCNGWlY7Bm8Nn527LggXN khkA== 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=Au5vlW0/T/UVsvKsDSVoNHoCDSTmkuAehtL6M83B73A=; b=HoVi/KlYi2DJpbKDXGyc+tN4MgF1HUiefe+zZJw+szM+Fc5RLuSo6fQ+ntQ6h0DvrK vGPXZ4eIKU8dr1jRKamBKPbRagtOcfOIgOQlEBa86jplshIcUEZLnAr1sCgvd3h7Ggjq IVLUE35BFdgQmPyRfnfy0JByC5q4yC7T1MZ+fE7w7jZ43nInIF0CrV/2pRiYuOQeOWAo BBCs8fowYCVwm76IG21Be8ct2iP4doFm0m/ojBWdqA5Z9sb6R+agxkhzFu0vH8N2X74N /f9Mh0vyAnTquVR4KlP9VEFLi7KUXToJMggk8DiNF83drTF6FzVWbeMkHNsGp8R61Mju 0nMw== X-Gm-Message-State: AHQUAub3Kkvn9ZiPGermAk+gw0nFxRrkht8xBGw9CHkxu26rSTczNdwr vDG7OT0D0fY7F1fAaqAGPLt2EHeV X-Google-Smtp-Source: AHgI3Iaq3aiH9stqtaCIxOgGOVrinKOG0WkyfpRuZvEcmphC+rGkWm/K5S7I9/NgQGmDcl8dNfwkxA== X-Received: by 2002:a62:ea10:: with SMTP id t16mr1449506pfh.3.1551271572046; Wed, 27 Feb 2019 04:46:12 -0800 (PST) Received: from local.opencloud.tech.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id q18sm18871238pgv.9.2019.02.27.04.46.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Feb 2019 04:46:11 -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 v3 1/4] net/mlx5e: Make the log friendly when decapsulation offload not supported Date: Tue, 26 Feb 2019 04:27:40 -0800 Message-Id: <1551184063-40628-2-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1551184063-40628-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1551184063-40628-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 If we try to offload decapsulation actions to VFs hw, we get the log [1]. It's not friendly, because the kind of net device is null, and we don't know what '0' means. [1] "mlx5_core 0000:05:01.2 vf_0: decapsulation offload is not supported for net device (0)" Signed-off-by: Tonghao Zhang Reviewed-by: Roi Dayan --- drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c index bdcc5e7..6cbfbfa 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c @@ -84,7 +84,7 @@ static const char *mlx5e_netdev_kind(struct net_device *dev) if (dev->rtnl_link_ops) return dev->rtnl_link_ops->kind; else - return ""; + return "unknown"; } static int mlx5e_route_lookup_ipv6(struct mlx5e_priv *priv, @@ -620,8 +620,10 @@ int mlx5e_tc_tun_parse(struct net_device *filter_dev, headers_c, headers_v); } else { netdev_warn(priv->netdev, - "decapsulation offload is not supported for %s net device (%d)\n", - mlx5e_netdev_kind(filter_dev), tunnel_type); + "decapsulation offload is not supported for %s (kind: \"%s\")\n", + netdev_name(filter_dev), + mlx5e_netdev_kind(filter_dev)); + return -EOPNOTSUPP; } return err; From patchwork Tue Feb 26 12:27:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1048870 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="sb5P5lT1"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 448b5j2Njnz9s4Y for ; Wed, 27 Feb 2019 23:46:17 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730200AbfB0MqQ (ORCPT ); Wed, 27 Feb 2019 07:46:16 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:38995 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726419AbfB0MqP (ORCPT ); Wed, 27 Feb 2019 07:46:15 -0500 Received: by mail-pl1-f193.google.com with SMTP id b65so4950157plb.6 for ; Wed, 27 Feb 2019 04:46:14 -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=CND0xRuyWcfrUwe4bXG7OvKtlDYxus1+6/psPJjwnf8=; b=sb5P5lT1zq2sKsx5W8p7s6T3l6NfFZ9tCAn1IFr7rhMfABF2DtbUsyLbFGrU/Wj396 S+8YGKOSNLJr52FWamdcQKBra8N8q4jg4KNm6czvCWlcumqhFyUc4nb9fCaDJQCINUg4 2OjztbMynZC2QjkaPVr1FQu/IrzbnhE4LynGKUHX0YAGRnH2iqXLi06YmJDxR6qMjjB6 zbarJzSO91R7vz5dfVpoYhc45FDEPQ6+WNi2K5a2Y7OHWiGKALKHlNyhTjvPyjfFJw6N +gDNxwP1ycPffaCx/wRJrsLIHr6m3linmrXF97HxESFIPn1OiYzKt+4hFFPk36ABaL3U hunA== 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=CND0xRuyWcfrUwe4bXG7OvKtlDYxus1+6/psPJjwnf8=; b=qQRW7pn8HLg0xxbq49wN+jEXd39Ne00/hw+e6n7J986lkhP4PLLam4dbH8ZnWg3dER OFMd/HNiOYLUrEZ+VQNnURjuA7gEpMncFJwhLZVhQwlGLemquYfpH/TU5icywOQKf1pc q+9BjH9OkYaHo8cjepTpLPJZ4OMzFnEj/AixesB0RrkyEEDF3B2KrqYyI1nfQiy0L81C YKDUEZJEJk7mARrTNO+2HHdsPMqbw5rmXg+WlsT9E/YDmGTsb+BQpZ4QZbwivp0g/xNy /OdiBLYSDNLAfiml66zrih6ofk7PXAoqqavZrLHNBOglzKO8AASlT/Ulg2XOCi0vxXUm Zo0A== X-Gm-Message-State: AHQUAubovxC+JxMNp3DtDCqLoRaZ8MTXzoJFXO1t29G1AspK0DZqXyUV nw1CV7xDdgqBTa2xNX4EJVXGLO9N X-Google-Smtp-Source: AHgI3IboXs/6OPZNHZiWgwzUmjjtdmWvNdNGziLWPY1p7QmbMBc0gkD8OskwGOSJ3Y6bi9X66rrdaA== X-Received: by 2002:a17:902:9306:: with SMTP id bc6mr1951533plb.59.1551271574384; Wed, 27 Feb 2019 04:46:14 -0800 (PST) Received: from local.opencloud.tech.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id q18sm18871238pgv.9.2019.02.27.04.46.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Feb 2019 04:46:13 -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 v3 2/4] net/mlx5e: Remove 'parse_attr' argument in parse_tc_fdb_actions() Date: Tue, 26 Feb 2019 04:27:41 -0800 Message-Id: <1551184063-40628-3-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1551184063-40628-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1551184063-40628-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 This patch is a little improvement. Simplify the parse_tc_fdb_actions(). Signed-off-by: Tonghao Zhang Reviewed-by: Roi Dayan --- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c index b38986e..336a111 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -2467,13 +2467,13 @@ static int parse_tc_vlan_action(struct mlx5e_priv *priv, static int parse_tc_fdb_actions(struct mlx5e_priv *priv, struct flow_action *flow_action, - struct mlx5e_tc_flow_parse_attr *parse_attr, struct mlx5e_tc_flow *flow, struct netlink_ext_ack *extack) { struct pedit_headers_action hdrs[2] = {}; struct mlx5_eswitch *esw = priv->mdev->priv.eswitch; struct mlx5_esw_flow_attr *attr = flow->esw_attr; + struct mlx5e_tc_flow_parse_attr *parse_attr = attr->parse_attr; struct mlx5e_rep_priv *rpriv = priv->ppriv; const struct ip_tunnel_info *info = NULL; const struct flow_action_entry *act; @@ -2788,7 +2788,7 @@ static bool is_peer_flow_needed(struct mlx5e_tc_flow *flow) if (err) goto err_free; - err = parse_tc_fdb_actions(priv, &rule->action, parse_attr, flow, extack); + err = parse_tc_fdb_actions(priv, &rule->action, flow, extack); if (err) goto err_free; From patchwork Tue Feb 26 12:27:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1048872 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="h/oM3if2"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 448b5q2jQmz9s4Y for ; Wed, 27 Feb 2019 23:46:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730264AbfB0MqU (ORCPT ); Wed, 27 Feb 2019 07:46:20 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:34497 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726419AbfB0MqR (ORCPT ); Wed, 27 Feb 2019 07:46:17 -0500 Received: by mail-pl1-f193.google.com with SMTP id d15so7996602plr.1 for ; Wed, 27 Feb 2019 04:46:16 -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=5SYuqc1OjXGU5xk3v0aXPfR8zpiyjez96G5HRCihkMA=; b=h/oM3if2US9cQz2LaVMtQ75McRxHYXLdtbpn3JrlUE0C4ltBIXLsrs+E+0ad3SO2qX +CoPVrKA4ngp1z1KxuXyBJ1n0QVmHPBnf29LX4NQDVd+0a/8PCNeolrhHa+kPQH3cgBH nFr13SeVgEh7eEP6adZs4xd+3JlrkwE8okhk04MitD69Ylx3r/Obf8wWN6sPRsFdTxYC iLYGVz1IGa3iDMO2SzjUdIcuKxRuxfD6VQ0tDWJxyCUzWCGyoQBlnyTzoiYCImD2aglJ 5gsksKeWepxqEkFbJzpOh0thinhtvIeWcT4omW6BR4S6n9lqvYwdJT0XU4HzW86xjpUY INgQ== 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=5SYuqc1OjXGU5xk3v0aXPfR8zpiyjez96G5HRCihkMA=; b=jH+MephURA7MhJ4AQKvTOOKdeyGH99dcHzsEfFBD/FN8fH6n2YeU34YJcBna3B3jEc iTJdB79qMS7Jbho7fiL2karCGKnbaFROcVgbyp538WXqGZYF2Tc3syLCfoI+qse6kd8t E+rKCPfUfOnnohDV0woU3SVu9eed/QNx05h6Ju24xBvpRAXwci7ZC5VacY28mOHKZAeV 9lcb67yngzJkTwj2cP6HOXusDEwdbXpkzcg1kZ8/v1RWJz1xS+/pwv+q4v9DgGGqKXwa F1nRnEDmBO5sppANpJ00yVYYmPRL+vXjuiw3ZVpj9sLtiQoJCxkr8DPjlOIM4LWxKa8I zmyA== X-Gm-Message-State: AHQUAub76a9nYqk3UbhngcXSK77Ld7gSU7bZfLhoqMYu1XXbPmpw/Xq2 ga4mfESRfa/zFfPfqp1SEbc= X-Google-Smtp-Source: AHgI3IbLprVL6mKH1dS2iAZCDfD8kLwiW3kNFyUz7xUMFpvAIETKGhJYUNxTYYFBgYQ39lrp6mQ0nA== X-Received: by 2002:a17:902:7082:: with SMTP id z2mr1931513plk.251.1551271576712; Wed, 27 Feb 2019 04:46:16 -0800 (PST) Received: from local.opencloud.tech.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id q18sm18871238pgv.9.2019.02.27.04.46.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Feb 2019 04:46:16 -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 v3 3/4] net/mlx5e: Deletes unnecessary setting of esw_attr->parse_attr Date: Tue, 26 Feb 2019 04:27:42 -0800 Message-Id: <1551184063-40628-4-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1551184063-40628-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1551184063-40628-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 This patch deletes unnecessary setting of the esw_attr->parse_attr to parse_attr in parse_tc_fdb_actions() because it is already done by the mlx5e_flow_esw_attr_init() function. Signed-off-by: Tonghao Zhang Reviewed-by: Roi Dayan --- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c index 336a111..56ac50d 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -2558,7 +2558,6 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv, out_dev->ifindex; parse_attr->tun_info[attr->out_count] = *info; encap = false; - attr->parse_attr = parse_attr; attr->dests[attr->out_count].flags |= MLX5_ESW_DEST_ENCAP; attr->out_count++; From patchwork Tue Feb 26 12:27:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1048871 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="nHc2AU1A"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 448b5n2KLsz9s4Y for ; Wed, 27 Feb 2019 23:46:21 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730269AbfB0MqU (ORCPT ); Wed, 27 Feb 2019 07:46:20 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:42682 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730201AbfB0MqT (ORCPT ); Wed, 27 Feb 2019 07:46:19 -0500 Received: by mail-pf1-f195.google.com with SMTP id n74so7970374pfi.9 for ; Wed, 27 Feb 2019 04:46:19 -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=pN/7nu6zdPOkbdxhsiTINiIY6N6Pt+OM+d3dwjgT230=; b=nHc2AU1A71hgWpzS6SEXSWuqN2r1tx8ixm+jy5P6ABRqlvnbgy6qOjgbPquaxEdDtS DU+KBqonZLInMbquRMg0NjeHP+wuW1dQtYaBQsnaVZWa13AXV65v+D54FAwGzuihcBJi zCoE7VkQRmAP6bpz2os+fZga524gk6CxG6tMaFO9Op8x/8Ba/texsGmH7Ejltf+av8l1 ZEKSDU8Rx+rk5vwwgWqIc9IcUTW+MI/9bX1BZdOVyOoD1f5hpfDe4bt4Fl1soPxN8+h3 Of6ngCmD4ngQT2+wioHGeKZ7K7aKavEVtF7ChzxJXYhgbwn4kAIYzjPl21d1JL6kmGet h5DQ== 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=pN/7nu6zdPOkbdxhsiTINiIY6N6Pt+OM+d3dwjgT230=; b=QBwVTNeDJwp1fIboMRY2twd9wFdVB8ms2gZCos/XekLS/ZghMdqlrIiYgW6oGyynp8 wsbnlsZ8eWsUc95u0VVaBMJXbl6X0AcOjkWy77n2/hbhPLgMEz+J3V4I5nx219FSYNTn e4hd/3xRlYvW/EzLaMZC9R4lAKWdvyyKTH9dzfpCVLcWi4l4g8HnMz6oC26nfyWlCvyE /qwY8jY5wlPOPDJwqpScYc/nLSS/7sNihKwYoFmXQ6thAxyY+uOMWZyY4AdCaY0OJVf4 ZCsAnCqIIxb7nVWtYskZ9fbyO9WKDm8KrafS8yUcs01C/PmhF+Rd7DRMf6ty9tBDHJdx Z3YA== X-Gm-Message-State: AHQUAubTChg+q5EedBbne5TcEqSjcOo0PWlI52BujupUmZCZloLN11ne lJUV6qPyIOXRX8GvQvZA/ME= X-Google-Smtp-Source: AHgI3IbzjA8J16lhciVU6n48WIF5ljraajphneXmhoco/+oNWNxRxia+cYCAB0cFK8n3uwq80PPlIA== X-Received: by 2002:aa7:8186:: with SMTP id g6mr1497994pfi.138.1551271579190; Wed, 27 Feb 2019 04:46:19 -0800 (PST) Received: from local.opencloud.tech.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id q18sm18871238pgv.9.2019.02.27.04.46.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Feb 2019 04:46:18 -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 v3 4/4] net/mlx5e: Return -EOPNOTSUPP when attempting to offload an unsupported action Date: Tue, 26 Feb 2019 04:27:43 -0800 Message-Id: <1551184063-40628-5-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1551184063-40628-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1551184063-40628-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 --- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 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..3a02b22 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -2035,7 +2035,7 @@ static int parse_tc_pedit_action(struct mlx5e_priv *priv, struct netlink_ext_ack *extack) { u8 cmd = (act->id == FLOW_ACTION_MANGLE) ? 0 : 1; - int err = -EOPNOTSUPP; + int max_actions, err = -EOPNOTSUPP; u32 mask, val, offset; u8 htype; @@ -2047,6 +2047,17 @@ static int parse_tc_pedit_action(struct mlx5e_priv *priv, goto out_err; } + 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); + + if (!max_actions) { + NL_SET_ERR_MSG_MOD(extack, + "don't support pedit actions, can't offload"); + 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; } }