Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp991535yba; Thu, 4 Apr 2019 01:56:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqybFGz/zuucJjqRfIzMgQg/zGXXXYMkNizlCjF86HUCfbY3y3urdOfWQbhMZmGuX7Jpc8Mj X-Received: by 2002:a63:f448:: with SMTP id p8mr4405274pgk.50.1554368164313; Thu, 04 Apr 2019 01:56:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554368164; cv=none; d=google.com; s=arc-20160816; b=RxrvAE5EH4hJdy1eupxHxkE/OZmJMl3+hcsshoYwemaNKuLT/xe8HBXpx08SD8FfMW 2w0sa+G702xWWYnDs8yx4+AZYOk6Ghz6dWQAdSNlvGNKfw+zeewKUmdJX0ji8EqdAKqw kSX074qZYZCFv00r/ORy1pAME/cscs2rhFKEVSYB11GHhynWOAzOZp3EVXqvk+bZYwuH VjXsjD7PEBgs7WGqYx0vffvnnSDl2ESO5qEvZ1+mFExBNdu0iyd8/d08tYdvFTtExLzj eU80aOMcN2/AfYljSxgSMBdQXYyKXmteZB11cvK8i2x7l1KS6dhNY4spnijPDBD7EkhT gU4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=PR9sWjMvs29p+kCU5se9p1D+iWSslvCjkb1QGptRCAI=; b=jiqvtyeoweeEgEP6zj4q8aPBRXhd7EcREVUWpd+RI7TyKPB6pEDHfwNNqg1KwyTsM1 0AGTHD41wzkJ6Mx1uEFv/BhXkeH0lkisto4uEHQASUagfonjhUnumHyGEgTYvDyopwHN TnNVyz/PTh07bwL6xYgZaJsshSKhGFtxWLzJLtrwUekOz1w5K124H0ey/NpertRoqvhZ g1JnyLtjAI8IQSOEdeMrshDdE1biy+j/9GTftohDmpKhVzkMSTbNWPGapV+hXXJN5IGQ p4hX6IUGi0d4sjhYfuIUQ1SdKfvVFJykniboT6DUjewg6w5+GTU7KHe6SmRzZSh4dBsm 19kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=WuJ8lQAT; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 137si15958214pge.63.2019.04.04.01.55.49; Thu, 04 Apr 2019 01:56:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=WuJ8lQAT; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730081AbfDDIyg (ORCPT + 99 others); Thu, 4 Apr 2019 04:54:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:57250 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729546AbfDDIyf (ORCPT ); Thu, 4 Apr 2019 04:54:35 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 38A1020652; Thu, 4 Apr 2019 08:54:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554368073; bh=Y387+yMMcxa4O++XVayTazcL2ePhULRcXulW57xsLnY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WuJ8lQATnTi2XAuvAxV/XZAOmP/73CraEhXBUxXv4L9iZCn4j1ECONZetm58tpKPE MZqChPDxS+ooGgN0HEJNo7bU+gwYhH1cWZMXNch1AsDXhYOQbg4iTLYH2ueXBZCdz7 8oP8bRTlGFXTIre4u3IVg1nU+IrGnwsjplmmLyMM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mohamad Haj Yahia , Tonghao Zhang , Roi Dayan , Saeed Mahameed , Sasha Levin Subject: [PATCH 4.14 011/121] net/mlx5: Avoid panic when setting vport rate Date: Thu, 4 Apr 2019 10:46:39 +0200 Message-Id: <20190404084545.913418661@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190404084545.245659903@linuxfoundation.org> References: <20190404084545.245659903@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 24319258660a84dd77f4be026a55b10a12524919 ] 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 Signed-off-by: Saeed Mahameed Signed-off-by: Sasha Levin --- 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 2f93e6e9dc9e..2aec0c021b6c 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c @@ -1966,19 +1966,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; -- 2.19.1