From patchwork Wed Feb 27 15:31:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1049571 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="aoO+8PzG"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 449G653rR6z9s1b for ; Fri, 1 Mar 2019 02:03:57 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730388AbfB1PD4 (ORCPT ); Thu, 28 Feb 2019 10:03:56 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:42632 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726027AbfB1PDz (ORCPT ); Thu, 28 Feb 2019 10:03:55 -0500 Received: by mail-pf1-f195.google.com with SMTP id n74so9847977pfi.9 for ; Thu, 28 Feb 2019 07:03:55 -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=aoO+8PzGuge9TyAnmxH7kE4lDD7IsPzsM5Y0OOgj4REC27tVmui+KZY1rkQA96ZrIp ramfruGo7oNdV6yvwoMcKwzi7s54QD8+TXxhla4z/J8Vhxt8PZ0QI1Q1l+fqX0gLXAhi iHaaSB7Gob7rp0SlFLPOc4BzVAVlk4y8CffdvMi01yDgOY0pXsfCf1gRsdtwhf3z8o/i Iq2+OaazjsqxoIQoFN/EzoKOCmjkGXCA0gpDKYd1SKVWbgpqow5km+pe68TfVmdhxBnY bfKVJJSpb/2I4nRwHssjmqtaeb8nNK2HVHQq1onOxW48fN/RUfCGGHk48Rd1ax1fJj38 WYDw== 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=tc+5n3qEaRlHWDYAqhzT7J9dmGRYu76M+m/q06vTZ0xAw8NZ4MBf+3wtjPPi7RrH2Y 0nPIGsWcMNqB3T72WvVVg7fPdk/qEBPT6SNO6q6F30C2osCVGLO7ZqPzkUfn3m6dpsBx WG3cNEvMRlGdEBMOlWSb1meNuDqr4TrCQO5QWitwPHh8OoacHpSUTQMr88330B9xlnCA YdLwYou40j+Uy4PM8Yvc56ZufjzFsf3OqeQesoA3nYC2DRoJOYvb7BYangpu3qlb60ud moBNfIYOnaGFYYgZlDKMRaGi9Jgl/Bw2bRsX0/dBthgSP7Wm/+N5DR6jCXQW2vhUh2eT 9xGQ== X-Gm-Message-State: AHQUAuYjonS8GXozaSjKHo1yEp9OFemCxaxcIYW6nUHRTChasaVrZqta zYS47ubKcF7QKgFV8U7v0XE= X-Google-Smtp-Source: AHgI3IbpBUomGw522mrKocr6+xfHMd69NqLnkWeSS2aIDxL02zmQo0zky3DdzDIqiUNVhkZxYl1Row== X-Received: by 2002:a62:e017:: with SMTP id f23mr52349pfh.152.1551366234887; Thu, 28 Feb 2019 07:03:54 -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.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Feb 2019 07:03:53 -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 1/4] net/mlx5e: Make the log friendly when decapsulation offload not supported Date: Wed, 27 Feb 2019 07:31:16 -0800 Message-Id: <1551281479-69243-2-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 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 Wed Feb 27 15:31:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1049572 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="TcswKZr7"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 449G682ws0z9s1b for ; Fri, 1 Mar 2019 02:04:00 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731278AbfB1PD7 (ORCPT ); Thu, 28 Feb 2019 10:03:59 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:44454 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726027AbfB1PD6 (ORCPT ); Thu, 28 Feb 2019 10:03:58 -0500 Received: by mail-pf1-f195.google.com with SMTP id a3so9836173pff.11 for ; Thu, 28 Feb 2019 07:03: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=CND0xRuyWcfrUwe4bXG7OvKtlDYxus1+6/psPJjwnf8=; b=TcswKZr7VNXDEme0xoSVT2xqyKo3yz8rcIsA49oHHeymrsHByehkrfBU9geI0FvAsX 1RrUBQ0NptjFKtOd2sBa8xCAiJcsMpA62FgKTVzR8JQ/VldZ9LWaid/5Ft5129bUsoOq u8xQzojJfUm8cdndfOwd0P7fqv25ZZO+UYaxdOsOMT3VxX7yMwGheSOuitG1qCI98pwZ +84pAD3onHqV11ozyMf6zjL6D/Y4utWbvhS4+ZAo3/WIUH/yerr8wIa0jrGCeOlwm0GO p3jEzgRp9ZLAuNEzUxZqMfdCChtPlD6Bvsgyi9Z3LsF7yR0UGwBi1zzD1z3aVlF72h9P 79ZA== 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=YAm3LD/k2D8IcoztbWz8zMi+UkDQFOX5R9I99czCLyznyd2h3IrKjMhv004PohO/BU HAnyjdxdFXaXVceX74pue6V04akjdRQwhd7GbA8eZ0/4ileuwFyd8LCExy1ssu4DHcvq 5eSUAQgyJIAGs0V5QYisBq7TWIZUWNIeJB0rjL0BgfNAYVN427LO475gwmddAPE2ejmR izBm2WYjUs+nvnRZx55QAq9mhbp/CUNyQPGopM/S3TBdo9kx8MZOHZH5/dlMdbxDnsBe 1trowWUEMUjidTcoMu+ZXYmD0kgIKyPsX6wXtoHyd0ITktEQ4JKAdJ1vmXS01aV+4tv7 rGjg== X-Gm-Message-State: AHQUAuZzSl167r6NLL8XT5X1YXgNdD0aIR0JNe7C8DLLtIF6fcaIHckY mqzYpW3A5Qa1UWqgeRaNqx9mLFbR X-Google-Smtp-Source: AHgI3IaRQeeZ95dkU9VINdmgwhwtAb4t4/+Xpk+LffMdPvmysg7YyIf6UgdH6mP3KftrLS1CmqiW+w== X-Received: by 2002:a63:7444:: with SMTP id e4mr8964570pgn.398.1551366237345; Thu, 28 Feb 2019 07:03:57 -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.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Feb 2019 07:03:56 -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 2/4] net/mlx5e: Remove 'parse_attr' argument in parse_tc_fdb_actions() Date: Wed, 27 Feb 2019 07:31:17 -0800 Message-Id: <1551281479-69243-3-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 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 Wed Feb 27 15:31:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1049573 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="g6tCS46J"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 449G6B4LZNz9s1b for ; Fri, 1 Mar 2019 02:04:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731486AbfB1PEB (ORCPT ); Thu, 28 Feb 2019 10:04:01 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:38186 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726027AbfB1PEA (ORCPT ); Thu, 28 Feb 2019 10:04:00 -0500 Received: by mail-pg1-f195.google.com with SMTP id m2so9848101pgl.5 for ; Thu, 28 Feb 2019 07:04:00 -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=g6tCS46JP3gPbNKRMYxOKUUqAqC5k8fxKkyxgLDxfpNZ5SOZjMAa2nL7sNULKJf7Me e+P0cp//YZdkRbYYhdCR2JNjDkvYKvbHdS0LxmLLXKrTIgBaTn+QiyE+nqpYynJJKrxh cL2db/sG7IQANVyRy1O8r6RkkUPflT8H5njCE1vOZWfjAFs6WPGuzted58m5d7N/aYzO c0hkHnO6BAr8YLNsSAr3Y8ozGMXCYj4E84Fgm/TCbjXidgciG1gLNInR5wly/vOudms6 I4ok28IJKw8lT7jaBFkq4IAOrlBfFt/jAYnlIXX/LEpFu/GpPfa3YUI8LL5raRm7+s3z DesA== 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=HXtj/D2lYmNz0VseJWHtIWVI1vdEvi2iiVvphZJdlcf0SPIPKG+aeWc79mzF2nuw/R Gm8B2Wd3/sM4xNcoEDX5IS48tzj2Pc+mj+FrkWHoBsbrz1vCQ8ef/m8J9JTy43hpPQL3 bGhsC1EujNEx15fNU6K6fCTj35jw+EXE05RE8skzhvfpnUsyo0HhSCNSdxCGt5iLw+RX 2uz1q5z9BuCrkVDuyR6t8HV2R3gh7TtoMTLnICsVXIPCw7pwzbSY4Scn3l7NDbc4e59u VWjmyr6p1dKuM1eWeGKZhH5WCR3spMVDIBMkxWSC4BE06en6x9gt54n0XSMz+dk1Cq5q w1FQ== X-Gm-Message-State: AHQUAuZorOhcj4L72uptRUoEqftftrrUCIIjDoinTLZrQnKZRnXwWwlP GodD4ZBGj+A7m24ouJGfn2E= X-Google-Smtp-Source: APXvYqyPq6FDjA/6xpTOiF7OyJ8opoqrLXY4OnB7WCgyXQ3g6CElpPsI7KeNruhCid4btsfXp1/iZQ== X-Received: by 2002:a62:6453:: with SMTP id y80mr4231pfb.203.1551366239804; Thu, 28 Feb 2019 07:03:59 -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.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Feb 2019 07:03:59 -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 3/4] net/mlx5e: Deletes unnecessary setting of esw_attr->parse_attr Date: Wed, 27 Feb 2019 07:31:18 -0800 Message-Id: <1551281479-69243-4-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 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 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; } }