From patchwork Thu Feb 21 02:14:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1046173 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="leoukShb"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 444wdS0QCHz9s8m for ; Fri, 22 Feb 2019 00:42:36 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728105AbfBUNmb (ORCPT ); Thu, 21 Feb 2019 08:42:31 -0500 Received: from mail-pl1-f195.google.com ([209.85.214.195]:45492 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725991AbfBUNma (ORCPT ); Thu, 21 Feb 2019 08:42:30 -0500 Received: by mail-pl1-f195.google.com with SMTP id r14so14201084pls.12 for ; Thu, 21 Feb 2019 05:42:29 -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=AUlWa9FoNeZjfHOPdayDZ3ELIRDaZU/99VW/g5UF+z8=; b=leoukShbhdXY/3lFKWccR33MpXWbHv4jvNK243YoRvRDQvRZqhu9VD7qDThT2P2dDz npTRYsGliK+uwLQTzmvi9DPQBUX7K7WWVD6B8GKrVTm2OU+7r62BPWg5FyU/9bmYejWo oShJ/5Ho9geuu0gttdkt9Am7mbJjaCEdy97u51H3t6wrlT7MC7aeDm+VhwAbkBgQC1RE 3+J3fCkykdW9VxwMSHLRyZWuGumSzV6XiL+/9IxtjVB9khiey67fsjhs9vYTN08RupYg DK5w42t7Mk7zWNsujsZM19d51fkhTGTgfWw0m1PKsqh5jiKqCdyBWCzmjHEFR/Es64u0 tjrA== 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=AUlWa9FoNeZjfHOPdayDZ3ELIRDaZU/99VW/g5UF+z8=; b=VVMkZjVBQ37ILnfOfx9XsUb+uwY+VVBkjxxNL6ye8j4VOioH/zPQUbbmGnENK8tO3+ ar0yyiCs2RYjHdALALi0czr41P4mI0wD6GXK1ufOVFqhAJkkEfzTJ6QAb6REAOx3AAEt D93ih6TOYpHeBOIKAoc+lh0q/YOeB7Q1yI65mvZ/WKpuCyWwqJ6YFzPgOLnrX4hkSEHW gKtxxa0JZkR9o814+d2ZGL2Dr/4mgILwShf38LqpE3LHTD9nXewbzI48J9V5sAgc+XlH MxM6S66CDO4tfqc+Qk3XFnBpxmkfbWU2Q2p+61aKC2bzaSq3OMLhBc3LmqixG+ZX5/1r 2Xzw== X-Gm-Message-State: AHQUAuYWwSzF7iFDW4tVhEgbWPBpdnfBLIPxoIH16Mly38qd7pWYpQDb r0fuaAcCoTlSeVqqWmRhQ2g= X-Google-Smtp-Source: AHgI3IZzrCiTMU6jXIHwhxOA11DZHJe3fWXviXqHpjkNtorYMKRgva0UnorNwRnizcwzofTN2W5UaQ== X-Received: by 2002:a17:902:a7:: with SMTP id a36mr42537029pla.295.1550756549506; Thu, 21 Feb 2019 05:42:29 -0800 (PST) Received: from local.opencloud.tech.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id n4sm5265970pfh.8.2019.02.21.05.42.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Feb 2019 05:42:28 -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 1/5] net/mlx5e: Return -EOPNOTSUPP when modify header action zero Date: Wed, 20 Feb 2019 18:14:39 -0800 Message-Id: <1550715283-23579-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 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 mlx_vfs 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 | 13 +++++++++++-- 1 file changed, 11 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..c4359f1 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,13 @@ 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"); + netdev_warn(priv->netdev, "don't support pedit actions, can't offload\n"); + 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 +2080,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 Thu Feb 21 02:14: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: 1046174 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="h0jR5NLq"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 444wdS6nKfz9sBF for ; Fri, 22 Feb 2019 00:42:36 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728117AbfBUNmd (ORCPT ); Thu, 21 Feb 2019 08:42:33 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:34811 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725991AbfBUNmc (ORCPT ); Thu, 21 Feb 2019 08:42:32 -0500 Received: by mail-pf1-f196.google.com with SMTP id u9so6597399pfn.1 for ; Thu, 21 Feb 2019 05:42:31 -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=LHhcxyZm99CEc5bGI4rzwEkPF4ohcSuLu0FF3f07+kU=; b=h0jR5NLqHp9d6j5ZaE3uMBWANbkowU3/S3PcDqlLiRHKaFKwr3brrMnc9xUmg1XURK wUPCoRmMqiPR3VL1h7mUSz+7qAW3uAz9y78uIivyaJm5AGUxpuSdZf4y4LZsZJ1esmEs U5QcDiGQWsc4XZlcsBWxWDMNRxI6ajMATQRKVJtgtJXfySwMGEv+pFP7kyxI/e9D8vFF 6aE4+lPKGHQ2ozERiU2BoEifZ7RRUrBn3luDforqcbihbBKlNMH+KxTG9hdffbgyOvj0 +QeBqJvCQii9d4BckWDaKD2zy6iznxRzZTZNSq4EJ690gvG0TtuuBM1sucOoH9Ar6aBo h4LA== 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=LHhcxyZm99CEc5bGI4rzwEkPF4ohcSuLu0FF3f07+kU=; b=QLkTS/mUp+mQ1upHpXkWNqh4jqMl/uYSY1HJMRnIXglU+fWn2diMqqWKruRAiO7pjo muOwvQd+eJbZF0gP92AuaTu3OL3vv1jZKtBK2+brajF+ttCChJV1eEPOoguaJcAFKDt0 ikjkJdvLntqDPMDWxFSaU4RYbuIryperRbASxNpaBV4RzIHXW0mt6qZim8vBeqG1uorl PlQN/giu1R6BHbv+2bUeZqCPfdTZq3UU+zrmzjU6aXv7a3hbVc3lzQY77S+D/z7V5A5N XxGMApzG+BogYZAWM8NNe6VS1794cllXxiXxcd+O697MsNRx7Euj5vkzCxaSuYRtNhh1 BaAw== X-Gm-Message-State: AHQUAuYyCDouikZYR8cq1QUI7uBz9K3XTpAuFIvn4rxubqaUU2/pvD2N SbP2cFlhTsJ+UsvPWLR0rPI= X-Google-Smtp-Source: AHgI3IbfOrBnyX/KrMh/PXaJyW6C6T9aO1c+ED6F16079I7KF3NabU6778x4AsWzPBXohDBeibaOqQ== X-Received: by 2002:a62:1ace:: with SMTP id a197mr296475pfa.78.1550756551438; Thu, 21 Feb 2019 05:42:31 -0800 (PST) Received: from local.opencloud.tech.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id n4sm5265970pfh.8.2019.02.21.05.42.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Feb 2019 05:42:30 -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 2/5] net/mlx5e: Make the log friendly when decapsulation offload not supported Date: Wed, 20 Feb 2019 18:14:40 -0800 Message-Id: <1550715283-23579-2-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1550715283-23579-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1550715283-23579-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 --- drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 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..6911e0a 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c @@ -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 Thu Feb 21 02:14: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: 1046175 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="F8XCy3TO"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 444wdV41hvz9sBr for ; Fri, 22 Feb 2019 00:42:38 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728121AbfBUNme (ORCPT ); Thu, 21 Feb 2019 08:42:34 -0500 Received: from mail-pl1-f194.google.com ([209.85.214.194]:39417 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728115AbfBUNme (ORCPT ); Thu, 21 Feb 2019 08:42:34 -0500 Received: by mail-pl1-f194.google.com with SMTP id 101so14206928pld.6 for ; Thu, 21 Feb 2019 05:42:33 -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=FRURjYlol0C/kMqV9q/vQqioVaHdr4Ar70zv5eZBI2I=; b=F8XCy3TOcYAi4k8NpnYN+HoBkoLbePJObiIweXbz9G/dVPM2Rk1PcMNGOZvf6K0EzQ ehHQwXmVwUpSH45M8n6XT5Ntv9a1SmBAysBKnT7S6PiccbBSgPNDy5F6DlkRS37FO6Aj /vAjTRkLRfFfqhN7rxkE9SSzp7Hb43YV4T4Ss2zRHLY18uRzfcwwEt9nHjYZxN9dVWoz LOTPJP/bHeD8WhICSOxqqqKeckYEN+HhyE9vcrcSfitN3hI+W7CHMlDsCl6WA1E3mVoz ryOUe52NhONth4czZkH+TGIEWaa9rWvMZpVr3F22DM5gtQqeEE6kYFcGBKPMYaw2Au1U 7brQ== 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=FRURjYlol0C/kMqV9q/vQqioVaHdr4Ar70zv5eZBI2I=; b=Ai0zjxr8bEPWU+ivmgetJ706NGg0daaoTyYvWoZf8+kqHbj2+4KjX3r2ZP0hp24G4b dSWjvpFd1YM5XdWAzoBfUgMRhS58R7SfJhtzODQdZ9JLrO4P2z9heDCx/iTO+tsvHi0H bQut2bkPg/a70AaIB3dVQQigY55V6S4ER42LDc/XfwKw/UhOhLECqOQ5R+TFF8HuXvIV rR9LleS6OpHaJGynMjGXRa/cgaPixbFCa0sxn83bNFPpowA+Ip9BJjgePE5cx/csiaF6 PvZ18gz4s1VAb5L8R19Ja3pcbrdZbFXyav1rZyEHLLMZC7v6bD/r4s8ixPEnvtOzlKkw KFsw== X-Gm-Message-State: AHQUAub8tzT2NmeMoTSt0ERJYPQclpSLdxxS1m2aRTwCV9EL5p0Zo8ev n1t7F1rI19mTbzI3qlbcO5w= X-Google-Smtp-Source: AHgI3Ia1xyo2UVazW7toarkkEG99+7PGQMmfNJhq9z5ifFE0eH3bf2ZBjLYWbafpCMIEipbj+UAxYw== X-Received: by 2002:a17:902:aa8d:: with SMTP id d13mr42710036plr.293.1550756553568; Thu, 21 Feb 2019 05:42:33 -0800 (PST) Received: from local.opencloud.tech.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id n4sm5265970pfh.8.2019.02.21.05.42.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Feb 2019 05:42:32 -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 3/5] net/mlx5e: Remove 'parse_attr' argument in parse_tc_fdb_actions() Date: Wed, 20 Feb 2019 18:14:41 -0800 Message-Id: <1550715283-23579-3-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1550715283-23579-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1550715283-23579-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 --- 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 c4359f1..bbe2374 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -2476,13 +2476,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; @@ -2797,7 +2797,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 Thu Feb 21 02:14: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: 1046176 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="HfhpC9QD"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 444wdW6WFhz9sCH for ; Fri, 22 Feb 2019 00:42:39 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728127AbfBUNmg (ORCPT ); Thu, 21 Feb 2019 08:42:36 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:39478 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728115AbfBUNmg (ORCPT ); Thu, 21 Feb 2019 08:42:36 -0500 Received: by mail-pg1-f195.google.com with SMTP id r11so13709164pgp.6 for ; Thu, 21 Feb 2019 05:42:35 -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=7eCbeuo0YjsO4HOnF1Gxts+BP2aQwvQEpfo0HYu0dws=; b=HfhpC9QD/B6oH4/72YVWODTOn6r9KNMxVSSmAPSVedHXS7rmwKxqvY57kACGx0RpTA QOBu3R6l5s813t2c6FxxvWplyZZllTsipc5Rp/fGo1f6To5VBRdW3iPxxduTh/e7W+uk tak5nTYisym20ghe/c/NLLpn9GWKhZf0hIcHQg9VxBuSAUEbcryrWMGJfd0b1TV96DbR BS8xgsOEdJj5vCNhMCGH8W3yyynUCWnNFaVbrw2sAwP51iDocMreS595xjtJXI5H8xZg U7HnCwkx4YnYXUfYcq1mhA2gmdOsEH3aHz51DoNXDkJjS4WyOEmiXcOgktVONNDTe0FB 7nhA== 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=7eCbeuo0YjsO4HOnF1Gxts+BP2aQwvQEpfo0HYu0dws=; b=XbMC/KkYIs0+3ZIkyd4Z1erq7H71X7o5N2Wz/HX2o+1vxzTUp/mC04SrT6FM6lIE9u wEMcswgcUgdrbhyrTb1mR9H4doLN9lVzozIebZQkL/uB0BQ3Edj6K2/cKUDYlWsPr/UC YC+QABTHcVoFRv1ZBHogiG73a4/ATTRAGOjXANNHaPGPDsvyRiXrvEB3pZ76MtnV8MPh sc2L5IU1JStZVBAcofnYwlnN6LzhFlc7XnfRXQp13EUTwK58CCC9g3Q18XkZ5epzhQL+ uh//bmQ+Zd9T74c8iAC9fu0LlZvdk6s8kAv5+sKewaZiokCcEOafOLS8H3qQbj4NKNsI aQ9g== X-Gm-Message-State: AHQUAua0JrC+TcasFTsOduX1G8vAglZQEdQ9oPMLij0ILstI+U8HXwzn VoZWC7RILvBwkRtV36V8zJo= X-Google-Smtp-Source: AHgI3Ia0cXvnuGcomIpQSzWnXprRTYWeE4vjRyCU/VKyPukTeFrMMH4zpBinpCZte9DomOXBe3rstA== X-Received: by 2002:a63:1960:: with SMTP id 32mr34266205pgz.171.1550756555542; Thu, 21 Feb 2019 05:42:35 -0800 (PST) Received: from local.opencloud.tech.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id n4sm5265970pfh.8.2019.02.21.05.42.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Feb 2019 05:42:34 -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 4/5] net/mlx5e: Deletes unnecessary setting of esw_attr->parse_attr Date: Wed, 20 Feb 2019 18:14:42 -0800 Message-Id: <1550715283-23579-4-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1550715283-23579-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1550715283-23579-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 --- 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 bbe2374..2d8ffdb 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -2567,7 +2567,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 Thu Feb 21 02:14: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: 1046177 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="tuzm/haP"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 444wdY5Ndnz9s8m for ; Fri, 22 Feb 2019 00:42:41 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728139AbfBUNmj (ORCPT ); Thu, 21 Feb 2019 08:42:39 -0500 Received: from mail-pf1-f193.google.com ([209.85.210.193]:33018 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728115AbfBUNmi (ORCPT ); Thu, 21 Feb 2019 08:42:38 -0500 Received: by mail-pf1-f193.google.com with SMTP id i19so845497pfd.0 for ; Thu, 21 Feb 2019 05:42:37 -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=Cr+dRlrDzifqo6lEwAkYsmOvMbnhXQfpMhMvJ+cWfPY=; b=tuzm/haPeh2/V8DfTKXkMY1k9hDMexUs/cTlOZIRz7PJjaLlYVFWKI3UKOBDDRWeq2 Qkf+6yVdx3xlepw3XTDIzl2q4HXb14VOYI+2rDWebA5BwIRFSxg154C0CrRQPpo3v7nO jBOM9LA5w44/438KR3086fLZMz14aUIB5n0db698EC6flqVPZ4mmuDaixgARHQApQ9TJ OIKYj3LP5BtWT4WjcDL/DjSpE8q1By2PG+SSAtL5lGZ9PEUVjTm2anNCXHXA7MuLzHv4 L2pB2yBT2MnacZucrYsBF+QbDTnP561vuulTDKinewMvhRJpgT0Fgk5PbDX+1EKWLHY+ OIOw== 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=Cr+dRlrDzifqo6lEwAkYsmOvMbnhXQfpMhMvJ+cWfPY=; b=IR+aTyLYAHM8sHf+M+15aVBKUN0FcMy9SJWrS07Lp0qvEC/zv8zmo7FrRzrDttNgeP OIqYD1SPFkEM1qlxBLpEaCufwjePHY4K1jWHsKTCC+qJOYgCPoWjSvHf35/9B+N8qiLF 9PCPteRwiQI2/FSqXvRnJaBz94k5uRB4sjMAtXTfr58qeGH5HtblGEXHw28HpeUyEgd/ vVFzkyAyahyOUTPZFNPBS4w2wMXSHKfOlTsUITU+RtVlHC0qOLebrskmp3wETYJwfvgE /lC8aoz8s4+SBas1ZrYnzUfMHooqIaTOnNtckKsBkO+1z44ja5mMBDMYVzqCo4E+m+s+ lwKQ== X-Gm-Message-State: AHQUAuZqn4Uh4VJPxnJ/l7PqqDT5BJy1cnKxfIkX+FhBh2pw8/x44rnS YmW9oxDTWNAfduxo3iJZ8i8= X-Google-Smtp-Source: AHgI3IZfKJ3ZrL+iNqDulTDjrnD7YDuHaczUQ02D+LfzV3GYITpbdsrns4F6sc4C0XRgHaeSfwqMUQ== X-Received: by 2002:a63:4342:: with SMTP id q63mr34705126pga.63.1550756557493; Thu, 21 Feb 2019 05:42:37 -0800 (PST) Received: from local.opencloud.tech.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id n4sm5265970pfh.8.2019.02.21.05.42.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Feb 2019 05:42:36 -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 5/5] net/mlx5e: Support enable/disable VFs link state on switchdev mode Date: Wed, 20 Feb 2019 18:14:43 -0800 Message-Id: <1550715283-23579-5-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1550715283-23579-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1550715283-23579-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 allow users to enable/disable VFs link state on switchdev mode. Signed-off-by: Tonghao Zhang --- drivers/net/ethernet/mellanox/mlx5/core/en.h | 1 + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h index 71c65cc..9f8761f 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h @@ -1063,5 +1063,6 @@ netdev_features_t mlx5e_features_check(struct sk_buff *skb, int mlx5e_set_vf_rate(struct net_device *dev, int vf, int min_tx_rate, int max_tx_rate); int mlx5e_get_vf_config(struct net_device *dev, int vf, struct ifla_vf_info *ivi); int mlx5e_get_vf_stats(struct net_device *dev, int vf, struct ifla_vf_stats *vf_stats); +int mlx5e_set_vf_link_state(struct net_device *dev, int vf, int link_state); #endif #endif /* __MLX5_EN_H__ */ diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index 878b346..f7475ed 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -3956,7 +3956,7 @@ static int mlx5_ifla_link2vport(u8 ifla_link) return MLX5_VPORT_ADMIN_STATE_AUTO; } -static int mlx5e_set_vf_link_state(struct net_device *dev, int vf, +int mlx5e_set_vf_link_state(struct net_device *dev, int vf, int link_state) { struct mlx5e_priv *priv = netdev_priv(dev); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c index 287d48e..d270552 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c @@ -1316,6 +1316,7 @@ static int mlx5e_uplink_rep_set_vf_vlan(struct net_device *dev, int vf, u16 vlan .ndo_set_vf_rate = mlx5e_set_vf_rate, .ndo_get_vf_config = mlx5e_get_vf_config, .ndo_get_vf_stats = mlx5e_get_vf_stats, + .ndo_set_vf_link_state = mlx5e_set_vf_link_state, .ndo_set_vf_vlan = mlx5e_uplink_rep_set_vf_vlan, .ndo_get_port_parent_id = mlx5e_rep_get_port_parent_id, };