Received: by 2002:a05:6358:111d:b0:dc:6189:e246 with SMTP id f29csp1924286rwi; Tue, 1 Nov 2022 01:20:52 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6OpuljvvjSaLrTBvikuzJ2vn4NM6d40zrmHTd5N6+7kofrorY3pj+wstr12NsGhpZri00g X-Received: by 2002:a50:fe85:0:b0:458:5562:bf1e with SMTP id d5-20020a50fe85000000b004585562bf1emr17348639edt.167.1667290852254; Tue, 01 Nov 2022 01:20:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667290852; cv=none; d=google.com; s=arc-20160816; b=q1YACXwdZbUv/4S2pRA1/mwJHneEZNRdFEIoSjYmGdPuPVhP6F2IzMSSxaSW+rWaJX EEnbqnvqpXQFpFu+aTYdwaTgYy7qvfOVcf7oDfEUWDePDju87K8vuntjdG64oIbVHX5u SpyCBHK33wjlI53yLdI0LGisuPGCgbCdpx9RjqauM5bFCbGyzycSc29O5DW16X2VVOiz f7NNwJb5LPLPZUU1A2B6Nombn9svL2wJbmsmtliv/Pgtag+N6gTtl4juYprXRQ4T9ti/ GC9S+URN7DOJRSajO9/q+Un/6ZxulR3tBvtlD+RCG3rlX51aN4rOl6MeebGzJdmiS6N3 F3TA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=Rid6D9AcqdK6EXNcut23J0aLQPFaw5kbgsV6MXuZQQI=; b=hDG3X8uH8mKDJrY3U79a3/d1EfG0KeAsU+IhXnC4GNG413zW3g67QFJTYR/kB0Tfn1 d8yPYBwWGpvmdzEn1qGoYQmQpyuX2uz25FBDJMueRUqQYPQNPB60o+6gAwqqhdfM7sMG i7kH+ce644eqDQdkXzYDlZq7qWiXHzo7ftNUnHiS80RMm7BSc6mul5mBVRyBwRj3hQ3/ kcN+BFyJNR89u7QYytn/un0rY4FvQDX+sNWyBLvUJ0FUuTFvrWd1wjWNCGvcih6fr6aA hCQHE92UULOwaExuZ1GP5sKPDDoOs6doQdNurexzGVccBjeV34/BtkbWVUT9v+e08Uns KN9g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hb18-20020a170907161200b007a9c3366e9asi12600778ejc.716.2022.11.01.01.20.27; Tue, 01 Nov 2022 01:20:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229917AbiKAHsY (ORCPT + 97 others); Tue, 1 Nov 2022 03:48:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229741AbiKAHsW (ORCPT ); Tue, 1 Nov 2022 03:48:22 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C9CF1D9; Tue, 1 Nov 2022 00:48:21 -0700 (PDT) Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N1hvd0nVGzHvVw; Tue, 1 Nov 2022 15:47:56 +0800 (CST) Received: from kwepemm600016.china.huawei.com (7.193.23.20) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 1 Nov 2022 15:48:05 +0800 Received: from localhost.localdomain (10.69.192.56) by kwepemm600016.china.huawei.com (7.193.23.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 1 Nov 2022 15:48:04 +0800 From: Guangbin Huang To: , CC: , , , , , , Subject: [PATCH net] net: hns3: fix get wrong value of function hclge_get_dscp_prio() Date: Tue, 1 Nov 2022 15:48:38 +0800 Message-ID: <20221101074838.53834-1-huangguangbin2@huawei.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600016.china.huawei.com (7.193.23.20) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As the argument struct hnae3_handle *h of function hclge_get_dscp_prio() can be other client registered in hnae3 layer, we need to transform it into hnae3_handle of local nic client to get right dscp settings for other clients. Fixes: dfea275e06c2 ("net: hns3: optimize converting dscp to priority process of hns3_nic_select_queue()") Signed-off-by: Guangbin Huang --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 6962a9d69cf8..987271da6e9b 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -12984,14 +12984,16 @@ static void hclge_clean_vport_config(struct hnae3_ae_dev *ae_dev, int num_vfs) static int hclge_get_dscp_prio(struct hnae3_handle *h, u8 dscp, u8 *tc_mode, u8 *priority) { + struct hclge_vport *vport = hclge_get_vport(h); + if (dscp >= HNAE3_MAX_DSCP) return -EINVAL; if (tc_mode) - *tc_mode = h->kinfo.tc_map_mode; + *tc_mode = vport->nic.kinfo.tc_map_mode; if (priority) - *priority = h->kinfo.dscp_prio[dscp] == HNAE3_PRIO_ID_INVALID ? 0 : - h->kinfo.dscp_prio[dscp]; + *priority = vport->nic.kinfo.dscp_prio[dscp] == HNAE3_PRIO_ID_INVALID ? 0 : + vport->nic.kinfo.dscp_prio[dscp]; return 0; } -- 2.33.0