Received: by 2002:a25:c205:0:0:0:0:0 with SMTP id s5csp3652363ybf; Tue, 3 Mar 2020 09:50:10 -0800 (PST) X-Google-Smtp-Source: ADFU+vvDlk85Y+TFTFijE1fdmse3W12jN2j51FtmoE2OmPc3+VjaaSWGoQqR0ExSkRHbDm2tzRXt X-Received: by 2002:a9d:6251:: with SMTP id i17mr4432967otk.14.1583257810101; Tue, 03 Mar 2020 09:50:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583257810; cv=none; d=google.com; s=arc-20160816; b=Eia0Gb4SR/UjJAt7/1EaYycCHbGccAOaKoui+j/QxyrlQwOITOXFLIUL38ShYe7iTZ dkJYu3XiZITwT4ewQiLrPC4QI4dUoyr/NmumOkzxdBYeYMf9G/HaLkMJNnJh44rwPGpk VH/HMRBMNNxF9hQNj0xNzoGsgEW1yx9T3QCcmUkj98bxBKi5rVy41GAR52Np7D6ar5uS 3ahClKFNCkD348RaYaZ/WA6iYPC2j8rG+Fy9TgiUYoTtF25hialRLYq6IQGrlicJRFIS Akc94pA30n9QCYB8nSi977SexToRcwN0VIZy3QmR9pcGoqT3xng3G6/uVXp9aVqoDGj7 FIHQ== 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=AJxYX/+kOOGaDgnZ23xA6HtPu+wVzLQ5vUVlZ8jK9+M=; b=xtMBYpHbTJfifoloUuojcdDvIQUsXFg6lZXTWtxxI5/zhfeZ/RIT0zynkxeSiz5zg4 Fi+ad5+DY8I/sWhl7yuTxjqMNy4oDz6tQ4AC8kAfCIuBw+1KOVtgEtnIuNgaStOKKPEZ ypQR46pypokQ5k2xUdgD2f1nRUK1RNQWi26P4sHGkwByxdVowDTJSGScKKkUjIIazLJD DvvKwKQZhwel+fhM0xbn3vOP79ikg5toCritvvSbI3pRKWudJSXwxzgch3azLCKlGCIG dHF3+KFjdXvidKlWY0T7S1kgLNs1dwsKty8d/4t23JboxzXSY09/W1c/A/+K0kMGSX9a CCkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="SuH8/5ky"; 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 l23si2516324otj.144.2020.03.03.09.49.58; Tue, 03 Mar 2020 09:50:10 -0800 (PST) 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="SuH8/5ky"; 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 S1730486AbgCCRsi (ORCPT + 99 others); Tue, 3 Mar 2020 12:48:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:55792 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730586AbgCCRsh (ORCPT ); Tue, 3 Mar 2020 12:48:37 -0500 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 2834420CC7; Tue, 3 Mar 2020 17:48:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583257716; bh=gevy0Y7WUjal6/sURl3hPhZqxBEX4jIYewIp5CtAAmA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SuH8/5kykIWdsfCKwnt84zmstIHdc1YDbZmt9/eEfdPjT3vnwP/zrMcd5tw6Np2RM g/0W7znOxuh+i8A7GZiUAm0n04X32b9okZ/Bcwe8lxke5+BO7S7ScmC2BsCPl1q2PF tpRHDJuslZ6Dy5uI6N/iQiShUl07xC+yTN3O8ojs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yonglong Liu , Huazhong Tan , "David S. Miller" , Sasha Levin Subject: [PATCH 5.5 076/176] net: hns3: fix VF bandwidth does not take effect in some case Date: Tue, 3 Mar 2020 18:42:20 +0100 Message-Id: <20200303174313.420985834@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200303174304.593872177@linuxfoundation.org> References: <20200303174304.593872177@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Yonglong Liu [ Upstream commit 19eb1123b4e9337fe20b1763fec528f837ec6568 ] When enabling 4 TC after setting the bandwidth of VF, the bandwidth of VF will resume to default value, because of the qset resources changed in this case. This patch fixes it by using a fixed VF's qset resources according to HNAE3_MAX_TC macro. Fixes: ee9e44248f52 ("net: hns3: add support for configuring bandwidth of VF on the host") Signed-off-by: Yonglong Liu Signed-off-by: Huazhong Tan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c index 180224eab1ca4..28db13253a5e7 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c @@ -566,7 +566,7 @@ static void hclge_tm_vport_tc_info_update(struct hclge_vport *vport) */ kinfo->num_tc = vport->vport_id ? 1 : min_t(u16, vport->alloc_tqps, hdev->tm_info.num_tc); - vport->qs_offset = (vport->vport_id ? hdev->tm_info.num_tc : 0) + + vport->qs_offset = (vport->vport_id ? HNAE3_MAX_TC : 0) + (vport->vport_id ? (vport->vport_id - 1) : 0); max_rss_size = min_t(u16, hdev->rss_size_max, -- 2.20.1