From patchwork Sun Mar 3 09:56:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1050834 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="HQamf2tS"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44Bz8X17ksz9s3q for ; Sun, 3 Mar 2019 20:57:00 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726025AbfCCJ46 (ORCPT ); Sun, 3 Mar 2019 04:56:58 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:44046 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725877AbfCCJ46 (ORCPT ); Sun, 3 Mar 2019 04:56:58 -0500 Received: by mail-pg1-f193.google.com with SMTP id j3so1094553pgm.11 for ; Sun, 03 Mar 2019 01:56: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; bh=9ZYFloyQ0bwwz3qsWb3Jw84XBecnbXnJV5zQ0fPL1NQ=; b=HQamf2tSm9BTtqmSCAC5bFNC5maSjxWd82H94fLjwxHWzhdz7ej1wWQRkwCmrLUexP 4AmIy0Z1sCPq8OKtNBF9pGvbX9lzJyxWrnOVopIWdFK1oBJyJ8R+/THyu5yRYlqE1tKC 6jwGZZJu3bJi7uQwd6b2muc55bJF6ab+qPJ0HwFR/6kqPkV/N+Laypj2i0gqkkz/bm5h XHhuvdW/MiAG3FPoc+EElObFGfjNbBeYuobdxkxqpt0kkAMCOp+y6fv/b5xTK60yek4S 9yILxgHaaN4WOqdvZJIb7fXCy3+/yVpHl4nBuIpeOFMK1S2OxD+ioLKmobxt64hS5sxs 442Q== 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=9ZYFloyQ0bwwz3qsWb3Jw84XBecnbXnJV5zQ0fPL1NQ=; b=KyxhWhaaD9QuEqJPLLaDV7GScbHQFipLy6rIJ4HLmb9StzBQiHubEm1Iosijj6kTT2 47ZUIdcL/Sl6fM48wtqY9YB+d/LabFpUIwQ1NYg1+RgdgWRx8issevCDjxJtJCAaPgbz aBFnieaDSmXvt4YPkYr13qOTYDDGbds3OOeVNnJNYIhp9amxPi09aYqqXeYzzsiFp8x3 Y5vV8aWyQmSwRwHIQXComirUca64awS9BaMB4FmrvTjviLMq4cOIKvEvrUOfvTSPXA6V tGEDLuMkQSbPqdKi3I57y7o47ULRFoh8JZvlkOS+z7YB8nBtewPOjsQ2tfCTyEh/0wUp Ed6w== X-Gm-Message-State: APjAAAVL50nkEXxgAAKNacf0KDYqrmEOOaIWi8sV3En339ju7LufjoPo L9XuKaCqB/HmBomWF17hyXS20SUB X-Google-Smtp-Source: APXvYqwLX8PFxuE2meRGXGb9lfTKCN3b/O/rudAfj9VmO0iDDVXfJYce4ZG4NHYsnjZwfyuIQALgMQ== X-Received: by 2002:a63:3fc8:: with SMTP id m191mr13442850pga.240.1551607016992; Sun, 03 Mar 2019 01:56:56 -0800 (PST) Received: from local.opencloud.tech.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id m64sm7982097pfi.149.2019.03.03.01.56.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Mar 2019 01:56:56 -0800 (PST) From: xiangxia.m.yue@gmail.com To: saeedm@mellanox.com, gerlitz.or@gmail.com, davem@davemloft.net Cc: netdev@vger.kernel.org, Tonghao Zhang , Eli Cohen Subject: [PATCH 1/2] net/mlx5: Avoid panic when setting vport mac, getting vport config Date: Sun, 3 Mar 2019 01:56:44 -0800 Message-Id: <1551607005-16321-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 If we try to set VFs mac address on a VF (not PF) net device, the kernel will be crash. The commands are show as below: $ echo 2 > /sys/class/net/$MLX_PF0/device/sriov_numvfs $ ip link set $MLX_VF0 vf 0 mac 00:11:22:33:44:00 [exception RIP: mlx5_eswitch_set_vport_mac+41] [ffffb8b7079e3688] do_setlink at ffffffff8f67f85b [ffffb8b7079e37a8] __rtnl_newlink at ffffffff8f683778 [ffffb8b7079e3b68] rtnl_newlink at ffffffff8f683a63 [ffffb8b7079e3b90] rtnetlink_rcv_msg at ffffffff8f67d812 [ffffb8b7079e3c10] netlink_rcv_skb at ffffffff8f6b88ab [ffffb8b7079e3c60] netlink_unicast at ffffffff8f6b808f [ffffb8b7079e3ca0] netlink_sendmsg at ffffffff8f6b8412 [ffffb8b7079e3d18] sock_sendmsg at ffffffff8f6452f6 [ffffb8b7079e3d30] ___sys_sendmsg at ffffffff8f645860 [ffffb8b7079e3eb0] __sys_sendmsg at ffffffff8f647a38 [ffffb8b7079e3f38] do_syscall_64 at ffffffff8f00401b [ffffb8b7079e3f50] entry_SYSCALL_64_after_hwframe at ffffffff8f80008c and [exception RIP: mlx5_eswitch_get_vport_config+12] [ffffa70607e57678] mlx5e_get_vf_config at ffffffffc03c7f8f [mlx5_core] [ffffa70607e57688] do_setlink at ffffffffbc67fa59 [ffffa70607e577a8] __rtnl_newlink at ffffffffbc683778 [ffffa70607e57b68] rtnl_newlink at ffffffffbc683a63 [ffffa70607e57b90] rtnetlink_rcv_msg at ffffffffbc67d812 [ffffa70607e57c10] netlink_rcv_skb at ffffffffbc6b88ab [ffffa70607e57c60] netlink_unicast at ffffffffbc6b808f [ffffa70607e57ca0] netlink_sendmsg at ffffffffbc6b8412 [ffffa70607e57d18] sock_sendmsg at ffffffffbc6452f6 [ffffa70607e57d30] ___sys_sendmsg at ffffffffbc645860 [ffffa70607e57eb0] __sys_sendmsg at ffffffffbc647a38 [ffffa70607e57f38] do_syscall_64 at ffffffffbc00401b [ffffa70607e57f50] entry_SYSCALL_64_after_hwframe at ffffffffbc80008c Fixes: a8d70a054a718 ("net/mlx5: E-Switch, Disallow vlan/spoofcheck setup if not being esw manager") Cc: Eli Cohen Signed-off-by: Tonghao Zhang --- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c index 6cb9710..774edc9 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c @@ -1871,6 +1871,9 @@ int mlx5_eswitch_set_vport_mac(struct mlx5_eswitch *esw, u64 node_guid; int err = 0; + if (!ESW_ALLOWED(esw)) + return -EPERM; + if (!MLX5_CAP_GEN(esw->dev, vport_group_manager)) return -EPERM; if (!LEGAL_VPORT(esw, vport) || is_multicast_ether_addr(mac)) @@ -1945,6 +1948,9 @@ int mlx5_eswitch_get_vport_config(struct mlx5_eswitch *esw, { struct mlx5_vport *evport; + if (!ESW_ALLOWED(esw)) + return -EPERM; + if (!MLX5_CAP_GEN(esw->dev, vport_group_manager)) return -EPERM; if (!LEGAL_VPORT(esw, vport)) From patchwork Sun Mar 3 09:56:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1050835 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="uLMp6naN"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44Bz8Z1WzGz9s3q for ; Sun, 3 Mar 2019 20:57:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726060AbfCCJ5B (ORCPT ); Sun, 3 Mar 2019 04:57:01 -0500 Received: from mail-pl1-f196.google.com ([209.85.214.196]:35074 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725877AbfCCJ5A (ORCPT ); Sun, 3 Mar 2019 04:57:00 -0500 Received: by mail-pl1-f196.google.com with SMTP id p19so1105950plo.2 for ; Sun, 03 Mar 2019 01:56: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=7MgP6ep/0HgpAPkdm6ov0o+N7qOh5D3JHosWIHNTF8I=; b=uLMp6naNA367JDETML0iAiSqOBG415f7r4fZDu+estNtJYKguO67d+5OBJajNHMDea Ajc3FrN9ptJkGyY+LEHgfjYh8uyhFrIhVrsXvlrimK8tGD0K0n4OyTaH576t7R2otMVO xvmwlXISbPF6m8RMeW+rHllc3mw4ejZGVcXQaXjMXO7HxDwl98MOvwevtdnqejiy0X6a VMz2WmPJKyjxHyXizro8YECfd12VIXGx/Yt8x8p/2APDtF9DbNgHlAuy41m2m98T94zZ HE8Eevox/LTcp17AfoquIuGF5fWZYhq3Un6qg6Z/D6nNbJWMpsPwhaf9Rm39hfYPLATP fiKQ== 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=7MgP6ep/0HgpAPkdm6ov0o+N7qOh5D3JHosWIHNTF8I=; b=i06B/oH02mXiaA8Id26jG3Pkxwc2pnyt0Y9sFLL8p2YrtR0Fw+8QOy1zZeb+1jiuSu /8ifbtJKjn2q8NL8+xwOkf40G02NazT3x5aihRN+8s4mmcu6UWlLLpbLkILLS6ENivqX VXdZHGYGmYoHCvihXh2c8o4UYGYNeNMtge3xe9Z2BjerfXnku5GHz3voPfjAA9tJpMl7 b1Si12hyg1Q5RB3K39DJO2iCsljG/ZNFVGrSrfaB28xea0x4dB9o9kL0SicqzrJ/v7ik vsFgBsSBabQZcX+rn0sy06Uir3kwGKoVOpWo1HUeX9KwXvzuwmdO60yy9zXY8Njeyafh PzAA== X-Gm-Message-State: APjAAAX/L6f+VzLLHxUfxWvL619cSq1keTtjwt9EFSwlHk0YhtKLt4Sz KpxJaw2LDsPXZFpjAeDijB8= X-Google-Smtp-Source: APXvYqw33IQslPSjC5DeIwmon7raIgQXl7RBHzJN1O3cGAQJz7w7pS5YQ+2MGUiEDBeQUQnInYHwEA== X-Received: by 2002:a17:902:5a5:: with SMTP id f34mr14674438plf.78.1551607019606; Sun, 03 Mar 2019 01:56:59 -0800 (PST) Received: from local.opencloud.tech.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id m64sm7982097pfi.149.2019.03.03.01.56.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Mar 2019 01:56:59 -0800 (PST) From: xiangxia.m.yue@gmail.com To: saeedm@mellanox.com, gerlitz.or@gmail.com, davem@davemloft.net Cc: netdev@vger.kernel.org, Tonghao Zhang , Mohamad Haj Yahia Subject: [PATCH net 2/2] net/mlx5: Avoid panic when setting VF rate Date: Sun, 3 Mar 2019 01:56:45 -0800 Message-Id: <1551607005-16321-2-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1551607005-16321-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1551607005-16321-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 set VFs rate on a VF (not PF) net device, the kernel will be crash. The commands are show as below: $ echo 2 > /sys/class/net/$MLX_PF0/device/sriov_numvfs $ ip link set $MLX_VF0 vf 0 rate 100 Fixes: c9497c98901c ("net/mlx5: Add support for setting VF min rate") Cc: Mohamad Haj Yahia Signed-off-by: Tonghao Zhang --- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c index 774edc9..8c2f1e6 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c @@ -2122,19 +2122,24 @@ static int normalize_vports_min_rate(struct mlx5_eswitch *esw, u32 divider) int mlx5_eswitch_set_vport_rate(struct mlx5_eswitch *esw, int vport, u32 max_rate, u32 min_rate) { - u32 fw_max_bw_share = MLX5_CAP_QOS(esw->dev, max_tsar_bw_share); - bool min_rate_supported = MLX5_CAP_QOS(esw->dev, esw_bw_share) && - fw_max_bw_share >= MLX5_MIN_BW_SHARE; - bool max_rate_supported = MLX5_CAP_QOS(esw->dev, esw_rate_limit); struct mlx5_vport *evport; + u32 fw_max_bw_share; u32 previous_min_rate; u32 divider; + bool min_rate_supported; + bool max_rate_supported; int err = 0; if (!ESW_ALLOWED(esw)) return -EPERM; if (!LEGAL_VPORT(esw, vport)) return -EINVAL; + + fw_max_bw_share = MLX5_CAP_QOS(esw->dev, max_tsar_bw_share); + min_rate_supported = MLX5_CAP_QOS(esw->dev, esw_bw_share) && + fw_max_bw_share >= MLX5_MIN_BW_SHARE; + max_rate_supported = MLX5_CAP_QOS(esw->dev, esw_rate_limit); + if ((min_rate && !min_rate_supported) || (max_rate && !max_rate_supported)) return -EOPNOTSUPP;