From patchwork Mon Feb 25 10:40:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1047669 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="ZKQoSVUS"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 447Jzz1Hs4z9s70 for ; Mon, 25 Feb 2019 22:06:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726765AbfBYLGy (ORCPT ); Mon, 25 Feb 2019 06:06:54 -0500 Received: from mail-it1-f196.google.com ([209.85.166.196]:55842 "EHLO mail-it1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726574AbfBYLGx (ORCPT ); Mon, 25 Feb 2019 06:06:53 -0500 Received: by mail-it1-f196.google.com with SMTP id z131so12157785itf.5 for ; Mon, 25 Feb 2019 03:06:52 -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=iXW3ry5FqIqFU+tmkzh5LRRJHa9oqvXNIhXLAsOdoCI=; b=ZKQoSVUSUS1bdZN3rNFbLAyol5jYOdi8tzudjwmWykw/Oi2/KkraO33ZrRtWzP1bmh qi9Io/Ec/XA3Nfg4IXXI/EPFkJtqORcZtMF9yTJfexW3lZMSwC6Ir4ZF0T2N6+90Ni0D G/KBEXoSWEQxwRZFUFDVBQ15KT64iMi81pHeXmeBlTBDzISZzRo/V+jqdNyP5vGwVoNz 6/65pj1+GZH6MU3oRD0zBdvU49Q/Te5AObTm5InagWPj4NzOG42KlzIuMtC8IpIDhJxu GOOvAxYzN5z5njBGex1evsWgfz2GU4NG8gS/zpMYHWc/tP8sSSIEooVWMcDFeY1VlOLz RTwQ== 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=iXW3ry5FqIqFU+tmkzh5LRRJHa9oqvXNIhXLAsOdoCI=; b=ub2JrQ5OGJ1QgU4wvjV8x2t01Ny39EM2uWcLdAb4yXW8i2xqgtIGz3NJdKzt520VbS /kFLEhm0KDxCk48CErlPJ7BnpI7NmbtZ8uv7RwGO6YmMqQe4GtD39MGCZDGKPMc3lf64 9LB1oKlR/cBYubf/nVLFmYSCtfU17YVQmpgGsPgFDcO+hRJ5FsEbjx3nZd12VQR6gV1d AfIQ/U+wfVVf4ia/+wobbTfwIt+dRIj8dVkZ9/GEXWKbrjjm/pbNAVavyIyIWO6oJLIf Gmz3tXr1HBUfQl1q5nc88E+MJXKjO0KJk7Oo3Xd/t40Fys9Xthrk7SKwNpV4+y70c1AP 371A== X-Gm-Message-State: AHQUAubCmQRNamdQLBawqKn/nxfRC6Vkv+xEOGMJ/xk9yHjSl4XL47jZ ntlzVYIdIvQ6leB8o+qLTiFZOIHq X-Google-Smtp-Source: AHgI3Iaw7seAvdZR9r1Udirhgv2263IaLV4a3ck2P2zC52wju041TYfMwt620gM86RJLYg5OOMkmCA== X-Received: by 2002:a24:5f54:: with SMTP id r81mr9070709itb.113.1551092812358; Mon, 25 Feb 2019 03:06:52 -0800 (PST) Received: from local.opencloud.tech.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id c1sm4768369itd.23.2019.02.25.03.06.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Feb 2019 03:06:51 -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 v2 1/5] net/mlx5e: Return -EOPNOTSUPP when modify header action zero Date: Mon, 25 Feb 2019 02:40:03 -0800 Message-Id: <1551091207-10366-2-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1551091207-10366-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1551091207-10366-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 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 VFs. For example: $ tc filter add dev mlx5_vf 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 | 12 ++++++++++-- 1 file changed, 10 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..708f819 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -2002,7 +2002,8 @@ static int offload_pedit_fields(struct pedit_headers_action *hdrs, static int alloc_mod_hdr_actions(struct mlx5e_priv *priv, struct pedit_headers_action *hdrs, int namespace, - struct mlx5e_tc_flow_parse_attr *parse_attr) + struct mlx5e_tc_flow_parse_attr *parse_attr, + struct netlink_ext_ack *extack) { int nkeys, action_size, max_actions; @@ -2015,6 +2016,12 @@ static int alloc_mod_hdr_actions(struct mlx5e_priv *priv, 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"); + return -EOPNOTSUPP; + } + /* can get up to crazingly 16 HW actions in 32 bits pedit SW key */ max_actions = min(max_actions, nkeys * 16); @@ -2072,7 +2079,8 @@ static int alloc_tc_pedit_action(struct mlx5e_priv *priv, int namespace, u8 cmd; if (!parse_attr->mod_hdr_actions) { - err = alloc_mod_hdr_actions(priv, hdrs, namespace, parse_attr); + err = alloc_mod_hdr_actions(priv, hdrs, + namespace, parse_attr, extack); if (err) goto out_err; } From patchwork Mon Feb 25 10:40:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1047670 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="C3xBPPZw"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 447K010rXFz9s70 for ; Mon, 25 Feb 2019 22:06:57 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726777AbfBYLG4 (ORCPT ); Mon, 25 Feb 2019 06:06:56 -0500 Received: from mail-io1-f67.google.com ([209.85.166.67]:45614 "EHLO mail-io1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726574AbfBYLGz (ORCPT ); Mon, 25 Feb 2019 06:06:55 -0500 Received: by mail-io1-f67.google.com with SMTP id x9so7107059iog.12 for ; Mon, 25 Feb 2019 03:06:54 -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=nFCP9U53ye40mkM1bdC3m4C/lii/yDcNlr34zu0IrQs=; b=C3xBPPZwKgkDy7X9We831xZeRtGu8eUndjTLPE1AJuY8AMfRv+5Im/4DoFsQA8q+dq ffor5+/dwxWGeqvAfYXCXCIdtbNZmT47SiHlqBj05k+1SQ2Nv/i9/pSF/nC7SZ+W+VNY uQQNqMcQ7WJ73hk5JiLqqL5dmHT44rUWDTmkZ6tMxeKKqp6nY6Jn0uBiYgifu/Q/oBF7 mL+9lzOP0jYXqRFwPHpyyV2BS+gMMCRO/MDrqeRJc7CIxBmsnCh3Sk5oVQxp3M6U9V5o JjflklQLGp3CH4G8iyUBF9dYjneozp6Jtjljz7Dn0fC9qtpi3GZmdjVOFz+Sxdm0ZGHG vBAA== 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=nFCP9U53ye40mkM1bdC3m4C/lii/yDcNlr34zu0IrQs=; b=XAvIFi4WXdVoIwazIR8krXMZTjXIsLUdqsure/mvwqee7Pje2wQ27g+JC3ubBu1k2s xPXGyvnIvzOE8qM16AFiUUGlahz81aYvQEOW/T7iG2HWH4vFaFqrEzxgyOCPLvh7lW6p APhiKHsATdxs2BfoDXDfiONSBkmRzNw8HCondydSwBt2dji0SKAoXi9LYBznuj/6+UFk TqOjnoGHSmHTl2fhYagZYorzx9yZKJ1OoPF8OTLd8IRw52c0koXC3klLpVX05osA/y5u q7A2wvoQRWqTOR/Wdss5i1+TpRxmKDR146vEV2BM6h6nZVh3C7Fc0h4CtU4o0FxcuCN3 hjgA== X-Gm-Message-State: AHQUAuaxau1pus3iOzqdNKPa72r/ixcnvTIj71Hy+QyjRC2baVfnZbDk 3dqhhVPjdGc9FwcWLQYbczM= X-Google-Smtp-Source: AHgI3IZPs6JFBdFYol8gh0azV0Myv6vbgK9ZXEViKuuveRziekLkG1cyTj1NA7vSvCNs2Zi9pOVCTg== X-Received: by 2002:a6b:710e:: with SMTP id q14mr8937595iog.210.1551092814454; Mon, 25 Feb 2019 03:06:54 -0800 (PST) Received: from local.opencloud.tech.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id c1sm4768369itd.23.2019.02.25.03.06.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Feb 2019 03:06:54 -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 v2 2/5] net/mlx5e: Make the log friendly when decapsulation offload not supported Date: Mon, 25 Feb 2019 02:40:04 -0800 Message-Id: <1551091207-10366-3-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1551091207-10366-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1551091207-10366-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 Mon Feb 25 10:40:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1047671 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="FO5nmDhx"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 447K035f63z9s70 for ; Mon, 25 Feb 2019 22:06:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726798AbfBYLG6 (ORCPT ); Mon, 25 Feb 2019 06:06:58 -0500 Received: from mail-it1-f193.google.com ([209.85.166.193]:50211 "EHLO mail-it1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726574AbfBYLG5 (ORCPT ); Mon, 25 Feb 2019 06:06:57 -0500 Received: by mail-it1-f193.google.com with SMTP id m137so12204105ita.0 for ; Mon, 25 Feb 2019 03:06:57 -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=hV1rWVftYgfsyt78foY8LB9cthIFLloRZueoNHWpFdk=; b=FO5nmDhxBB04sWALhD560VlHTN9ODPN7LeasiFqfVJdQbITyZEmxQpLAvrn084L9c4 2eeGeGvTlhgCASr3AlqDU7ML0gNHngZRdmmIjD3+fVdSAD2lBkdnLVcDBJe9I6SoovYP qnw9IfJ409Ic1XoMJCfzAIW9qNs0oX2b10ENDfUo8vvvvc7eezCN4EaoN3Dt2OG3b8Yw 5aWTVvm7sAFNz5gdgtdlWao/4yWt/SUBQJEHWmM/LDhPQ5l7LQmb2c2hBmjwRYRVxiWs 9MhzF9wQDmv2FRj+ZPG72y8u8hW+GkTNCGKgVz+1kwOmVlPQcNRKw3OLUmGFWCNh3ZDP 2dcw== 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=hV1rWVftYgfsyt78foY8LB9cthIFLloRZueoNHWpFdk=; b=J/nZedEvQP7uvq4RCnHaQoEW5zewoGcU/SYrRw92B3Jxpcn9u3jl6y2fsLwif9FQOD IaVs98ZIGjvQMTuG9Lj8S79oBRaa3AFvQU0d/VUfcv1EYNlbkmMBeBIYE2DjV7KePany 3Tard0buJw48iyr2n7anhOuWdbBy//cQCZx+DgXOEcvaXSXCv1Svwp+599gZX67l8lPo EfQH47qDL1HdCUCM9RuZ5n8gL6DxaWbz7fiEkU/UIKFmGMszBC6kOMYFpBL93KbRyW3w /QdMGEUWBefEiymgsGn7CuS/JK6WkUcJfUAbx+QvnamVxErRpP8Msj3QuRzlbwv8IITR gZ8g== X-Gm-Message-State: AHQUAubcwXxAeUdqnPj5BzizxvoDH7ibK12EkjVvUTBBud0phPT52Gtv HlOU+ip7t3JPyBwNsH2K0sQ= X-Google-Smtp-Source: AHgI3IZTK3gRWtNkosYtW9DkKcsWH0imF0RmjLA/044GRXHJUh3I0zL2XKD4Uc8RBA+EsmZcnkpxXw== X-Received: by 2002:a02:7e4b:: with SMTP id h72mr9403731jac.129.1551092816670; Mon, 25 Feb 2019 03:06:56 -0800 (PST) Received: from local.opencloud.tech.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id c1sm4768369itd.23.2019.02.25.03.06.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Feb 2019 03:06:56 -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 v2 3/5] net/mlx5e: Remove 'parse_attr' argument in parse_tc_fdb_actions() Date: Mon, 25 Feb 2019 02:40:05 -0800 Message-Id: <1551091207-10366-4-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1551091207-10366-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1551091207-10366-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 708f819..e6583b9 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -2475,13 +2475,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; @@ -2796,7 +2796,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 Mon Feb 25 10:40:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1047672 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="eLGNJSR5"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 447K056Wjqz9s6w for ; Mon, 25 Feb 2019 22:07:01 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726807AbfBYLHB (ORCPT ); Mon, 25 Feb 2019 06:07:01 -0500 Received: from mail-io1-f66.google.com ([209.85.166.66]:32945 "EHLO mail-io1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726574AbfBYLG7 (ORCPT ); Mon, 25 Feb 2019 06:06:59 -0500 Received: by mail-io1-f66.google.com with SMTP id e186so7171131ioa.0 for ; Mon, 25 Feb 2019 03:06:59 -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=/w+xy/3RflpoEiDhlFtamcBZvQOs4TmneQ5REq5InZE=; b=eLGNJSR5NeL5yy+miPGJEG96mVrbdcR0ISk8Xkn9+6QuA1VL+AfRH4lAzL+vApi46e ubDhDOpj90CS3i1vIUKwmW3p1E9wgRfwowL503GcMH7XFHyhY3qsOUoQK/zCV+qJ0MK2 diK8D+Zex1uhxUPkCXn3DW2rivZAAqTreRlPart1yZKvO7ReaxrcBFbrbiETNCgkyfFs UiUoxgmUGrCxU0N+0/Ufn7SZgFII7I++7CBh4RJqM7TP9Jjb7EDGqDRlhU/Os+sKdcga AeHo+X3wjUpF6FGZZBWUYlfp6DRZzL3HxecX/E+YjJxKnOwOba4J3h4g7h4gs2IYj2/d lkNA== 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=/w+xy/3RflpoEiDhlFtamcBZvQOs4TmneQ5REq5InZE=; b=MOoMNPiXgkg75V27/cxPqGo+3J4YITlDBZOaiMqir8RGLc0MifHSN4jfa2fQwMoQWo 97mIUQaCrPSNZMCw6HYoa9hmHuqsbAn+rKGCyGeFLHHmZM0JSVYZgTXeItZfTJ2WUFjp kaNUHtE/NSL+1LtOl1Oyz3jR1H0EIzZvPDoNsdxkHSsCZGivCKuRc+9b81sFkm5qpLYe TwH4hTb1DVd5kgtt/0+qupQOCyWyQSY2FKN8Q6zoAGtqITJ9p+QFV9bvzuuU51PTdXS/ OolirYOWxjcfcLcq9EuIOz+gXHhWFrZ5SDkFEPrdxHF+Yqz1hiFtfazuKd0zyjDGW4o2 TkHw== X-Gm-Message-State: APjAAAWzfiWY/NBirTn+S0c9rtbcjmcOHvtVbLyW9hpg27rZjg9vq8/2 my09UJaN0jc3gjCoCfyrxNs= X-Google-Smtp-Source: APXvYqyueTVR0HrJUoO5sr3Fa4eavseOisujAXC/JasPH9m4uiWCfJ/ZwebcAaQDjx1BVacqS61hkg== X-Received: by 2002:a5e:d917:: with SMTP id n23mr4694431iop.182.1551092819022; Mon, 25 Feb 2019 03:06:59 -0800 (PST) Received: from local.opencloud.tech.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id c1sm4768369itd.23.2019.02.25.03.06.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Feb 2019 03:06:58 -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 v2 4/5] net/mlx5e: Deletes unnecessary setting of esw_attr->parse_attr Date: Mon, 25 Feb 2019 02:40:06 -0800 Message-Id: <1551091207-10366-5-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1551091207-10366-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1551091207-10366-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 e6583b9..d9fcb14 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -2566,7 +2566,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 Mon Feb 25 10:40:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1047673 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="sK1nATf7"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 447K094Yhfz9s6w for ; Mon, 25 Feb 2019 22:07:05 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726818AbfBYLHE (ORCPT ); Mon, 25 Feb 2019 06:07:04 -0500 Received: from mail-it1-f195.google.com ([209.85.166.195]:39501 "EHLO mail-it1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726574AbfBYLHC (ORCPT ); Mon, 25 Feb 2019 06:07:02 -0500 Received: by mail-it1-f195.google.com with SMTP id l15so12641399iti.4 for ; Mon, 25 Feb 2019 03:07:01 -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=Yr4MSHIopFCdm/pFaphsfAjIyI8E7658VpQPQW6JN2U=; b=sK1nATf7uBR98ngO3yUO9HbqURhT5dEQfEiqeQQtRq/phe6e0KINbPibTa7lt8/lx3 9fLsHZzV8SL8m8o9Imlcq+dvsJQR3BqjarhLcysBdN80EHkqlEGmzInK5IOECsYCcOuQ o4zL4Gi/BQx/+1LDyVjU7V91TsLqBucdobWYoyJyMbxCaBnKBMjM6fchacJaUyHmE8F4 NK+S+lQaJsioCF/bfPbeAVEWDlEz7S4Nxxija6qV0YPEBJi02z782V/vUVa9IhFP1Dj+ 4nBSOftYF8JpCpEMk13rDzf0RdA5vYRHLG1oDDr/1NFbb3SBmfcOXEkRCak5y7KdLX2/ OIEA== 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=Yr4MSHIopFCdm/pFaphsfAjIyI8E7658VpQPQW6JN2U=; b=NaifNcVAg+kfcKJcQNbJ8ILpughYFSC26ATkF/N8GoE/FF4DniOK1lymIT/dger+Aj qThD59PltZYnvh+kqRD8OLTYsdTUtwV3ijyvJSerCQp/56wOXM/EPxbIia4EoegHDitB SqZszOFoj17Mv+NIPHGn8Y7q7Uky1Pzqdf05ccsIE+5wwEQjS/9843WKy3Mr9A0A/K/J 5IEjv7hh4/636P6Khf+DJO8Denq3in3iMNwuvBRaNJG04I4u1xoxp92QcnGfMi7ScBWB +wkDwrMMZK8oXBnwHGBHmJHp9VZFuiNAQASecSn6Iug5gyewqIgI7hdezLMr0XQZiAAr Lc1g== X-Gm-Message-State: AHQUAua1K0TbbJ973P2S37JUMW94zQgyNnfxo+VUqM4Yx2XoTB9zAIi2 4hGI3Z8SgtTcELxEqb4bid0= X-Google-Smtp-Source: AHgI3IYmwkd7yc9o8BWzeXqMQx8OUPakLc2t9zZfac3DUdK9oCf/CtndDe5ZzqWS7mvPuEWpOl6o9w== X-Received: by 2002:a02:308:: with SMTP id y8mr9658647jad.142.1551092821079; Mon, 25 Feb 2019 03:07:01 -0800 (PST) Received: from local.opencloud.tech.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id c1sm4768369itd.23.2019.02.25.03.06.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Feb 2019 03:07:00 -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 v2 5/5] net/mlx5e: Return -EOPNOTSUPP when attempting to offload an unsupported action Date: Mon, 25 Feb 2019 02:40:07 -0800 Message-Id: <1551091207-10366-6-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1551091207-10366-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1551091207-10366-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 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. For example: (p2p1_0 is VF net device) 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 "RTNETLINK answers: Invalid argument" Signed-off-by: Tonghao Zhang Reviewed-by: Roi Dayan --- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 6 ++++-- 1 file changed, 4 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 d9fcb14..f5029ea 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -2302,7 +2302,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; } } @@ -2624,7 +2625,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; } }