From patchwork Mon Mar 4 08:27:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1051011 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="X6uyOjfv"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44CY6z46nbz9sBr for ; Mon, 4 Mar 2019 19:27:39 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727272AbfCDI1g (ORCPT ); Mon, 4 Mar 2019 03:27:36 -0500 Received: from mail-pf1-f193.google.com ([209.85.210.193]:37829 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727258AbfCDI1b (ORCPT ); Mon, 4 Mar 2019 03:27:31 -0500 Received: by mail-pf1-f193.google.com with SMTP id s22so2473517pfh.4 for ; Mon, 04 Mar 2019 00:27:30 -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=XbDSDI4njkpr9TE70ejkSBokNdh3vXi9zB0Awi0YNGs=; b=X6uyOjfvewp7MvcVzht+8daE+Rrdc9eoPqbAhd/lZoLaBZSar0o0xDIp2AfBskRTea +gEsboFG1dIA3riQ9VPnT6eiXcwIRmDYSFKsKnFtxEWtC+sCgz0i4vyVOSrm/oUD2PG1 mxeVVqsYNPB8Xd3Xs6QyJ6XIcbJqLJzjUrnhsyLm02SE4xtAytb1E/jqYsUWx4i5OuMx zfFkBrFf5vArx1XXjX66C/cElTvYvPu0iDb6hD58pic3Nwyq01r46U0BpvU4noiSzTAF KhodD3IPWsegBATwoiK+PbXE1+a4VtByoVTgL6p6FezVXaYYsf9lAMRpdOrxsvbCXQHN taqw== 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=XbDSDI4njkpr9TE70ejkSBokNdh3vXi9zB0Awi0YNGs=; b=gMN4Y6t2LbcBViNDsruurdIL0iX0w4gQY3lbGZx+dekh6wZ7+HRyQq1UbkHhjibcr8 KeyPx3h/99+1BWtEV1Q5Ncs+KVJgcXA3KH4jm48088eBS2/AeNJi7jc8/tww9gj37ovs 1oEQGYwxFkDiPbQuwDPnGj0P9O9PjSe9OEwzRwFzWzAIgajTOL9k0X/j7jhEkAX1C3uv fUWM5OZ4Yp5Yi0aOUxvW5JwPXuB5M6OV1drq24FRq052pbqHNVGHETiLoTD3eJhKS1tu Gk5fQ1LdrYs5ITNIeA0YyKyqhOWiQEUl41x/O53HfegKi9ei1/etijd375d5grD+vTLv pdUA== X-Gm-Message-State: AHQUAuYoUo5rKpy8BEiAUUi1CQRGFjGjZRuknWM0BOpMvBqrGsvrZcbf ln/Ig5/AmMvVXaCh/qoxpWE= X-Google-Smtp-Source: AHgI3IZPJi8vTMQxPm2Z5/1aagjreZcUqq+A5fBNOAxwswjByvJUbVIx/Dmpq40orPUBbpz0z15x6g== X-Received: by 2002:a62:fb10:: with SMTP id x16mr18961127pfm.5.1551688049656; Mon, 04 Mar 2019 00:27:29 -0800 (PST) Received: from local.opencloud.tech.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id u11sm6605427pfh.23.2019.03.04.00.27.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 00:27:29 -0800 (PST) From: xiangxia.m.yue@gmail.com To: saeedm@mellanox.com, roid@mellanox.com Cc: gerlitz.or@gmail.com, netdev@vger.kernel.org, davem@davemloft.net, Tonghao Zhang , Eli Cohen Subject: [PATCH net v2 1/2] net/mlx5: Avoid panic when setting vport mac, getting vport config Date: Mon, 4 Mar 2019 00:27:15 -0800 Message-Id: <1551688036-7556-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 Reviewed-by: Roi Dayan Acked-by: Saeed Mahameed --- v1->v2: check only the esw is null, instead of ESW_ALLOWED. --- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c index 6cb9710..385e5cc 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c @@ -1871,7 +1871,7 @@ int mlx5_eswitch_set_vport_mac(struct mlx5_eswitch *esw, u64 node_guid; int err = 0; - if (!MLX5_CAP_GEN(esw->dev, vport_group_manager)) + if (!esw || !MLX5_CAP_GEN(esw->dev, vport_group_manager)) return -EPERM; if (!LEGAL_VPORT(esw, vport) || is_multicast_ether_addr(mac)) return -EINVAL; @@ -1945,7 +1945,7 @@ int mlx5_eswitch_get_vport_config(struct mlx5_eswitch *esw, { struct mlx5_vport *evport; - if (!MLX5_CAP_GEN(esw->dev, vport_group_manager)) + if (!esw || !MLX5_CAP_GEN(esw->dev, vport_group_manager)) return -EPERM; if (!LEGAL_VPORT(esw, vport)) return -EINVAL; From patchwork Mon Mar 4 08:27: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: 1051010 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="NZthwO2J"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44CY6x3kl6z9s3q for ; Mon, 4 Mar 2019 19:27:37 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726988AbfCDI1f (ORCPT ); Mon, 4 Mar 2019 03:27:35 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:36432 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726934AbfCDI1d (ORCPT ); Mon, 4 Mar 2019 03:27:33 -0500 Received: by mail-pg1-f195.google.com with SMTP id r124so2558341pgr.3 for ; Mon, 04 Mar 2019 00:27:32 -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=TmR9UvKwrQze4tuSUQH05qaRKkPAWVl2M1EtZdgHEYE=; b=NZthwO2JWyqh8AdnAFSnioOnkt/ot8BjtAjdC0HVqdoUkf1KTq9+c7VDud0ZDfiXl+ wAGV5QnY4jiFvpMRFBmGZW91r+aOS3cM4e0Tig1yYM7GObGPW7g/0bDrwZJoUt4M5/P4 fyNwlkBHwSEpRd+ZhzXr0uX3X4etXZe/R2SxuwOyRUNRnvlOhaxpoPMTAnsAMzy0pxz8 LN1ca7WeUF/VHpLE4Oj1+OjzpWvb67sBbeanbo30y+Twr3su3eGBOoLGc+tuxvcoL3h1 Df08SFsaxjkRUViIfXihWiZOm428QW7g3TArjaBxcFhj8SLvi0U7Ob1/GzVRgbYv37Zb OXDQ== 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=TmR9UvKwrQze4tuSUQH05qaRKkPAWVl2M1EtZdgHEYE=; b=LIf9EVcPdDqj/5zTXdEMUgs/gcBwr/GKPXP82kzMLeSFneZ+K7CNB62O9X8yeglYaj VyMvTk2rBDHQAP/f4Djqk252WrCVnCIaE9X8hbcjyQuK44L+EZinD8KGBX7f6e797Ng7 u0Nuk75lWRwu9dJihjjg0N0qtJbSEKgafOcuXS0eGbQORrZtMhr0cYSGP25V81pa9krY JiKzOIFc7yaW99aH2RjDZ/qXQGduyMIbksNu37xcXBvcxPnUYQ51y3Ori0+6yRzyasj8 ifQjkiSEWsLqor6jp54goXMCElGukwbqRKzkQtKa5fsRp7d+QtXRKbYtkAy6hkVY56k6 d6BA== X-Gm-Message-State: APjAAAVhgjqvWzgnnzrLhNCSBCeSqjRa/tIJHdeeZo13uopWUiJrlRq5 jb5dXAnwu3QUcn4Lev6dBxY= X-Google-Smtp-Source: APXvYqyeFlktImBq2farbpCcsNYulTslP8oNjVRrkQhf7VXIw7r+rz67FIInTHQbGu8X9V260/iXDQ== X-Received: by 2002:a63:fc64:: with SMTP id r36mr17492144pgk.280.1551688052551; Mon, 04 Mar 2019 00:27:32 -0800 (PST) Received: from local.opencloud.tech.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id u11sm6605427pfh.23.2019.03.04.00.27.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 00:27:32 -0800 (PST) From: xiangxia.m.yue@gmail.com To: saeedm@mellanox.com, roid@mellanox.com Cc: gerlitz.or@gmail.com, netdev@vger.kernel.org, davem@davemloft.net, Tonghao Zhang , Mohamad Haj Yahia Subject: [PATCH net v2 2/2] net/mlx5: Avoid panic when setting vport rate Date: Mon, 4 Mar 2019 00:27:16 -0800 Message-Id: <1551688036-7556-2-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1551688036-7556-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1551688036-7556-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 max_tx_rate 2 min_tx_rate 1 If not applied the first patch ("net/mlx5: Avoid panic when setting vport mac, getting vport config"), the command: $ ip link set $MLX_VF0 vf 0 rate 100 can also crash the kernel. [ 1650.006388] RIP: 0010:mlx5_eswitch_set_vport_rate+0x1f/0x260 [mlx5_core] [ 1650.007092] do_setlink+0x982/0xd20 [ 1650.007129] __rtnl_newlink+0x528/0x7d0 [ 1650.007374] rtnl_newlink+0x43/0x60 [ 1650.007407] rtnetlink_rcv_msg+0x2a2/0x320 [ 1650.007484] netlink_rcv_skb+0xcb/0x100 [ 1650.007519] netlink_unicast+0x17f/0x230 [ 1650.007554] netlink_sendmsg+0x2d2/0x3d0 [ 1650.007592] sock_sendmsg+0x36/0x50 [ 1650.007625] ___sys_sendmsg+0x280/0x2a0 [ 1650.007963] __sys_sendmsg+0x58/0xa0 [ 1650.007998] do_syscall_64+0x5b/0x180 [ 1650.009438] entry_SYSCALL_64_after_hwframe+0x44/0xa9 Fixes: c9497c98901c ("net/mlx5: Add support for setting VF min rate") Cc: Mohamad Haj Yahia Signed-off-by: Tonghao Zhang Reviewed-by: Roi Dayan Acked-by: Saeed Mahameed --- v1->v2: change commit log --- 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 385e5cc..9e339b2 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c @@ -2116,19 +2116,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;