From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 92A4EA0524 for ; Fri, 5 Feb 2021 12:32:13 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8D0AD1889F8; Fri, 5 Feb 2021 12:32:13 +0100 (CET) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mails.dpdk.org (Postfix) with ESMTP id 715B71889F8 for ; Fri, 5 Feb 2021 12:32:12 +0100 (CET) Received: by mail-wr1-f54.google.com with SMTP id z6so7264204wrq.10 for ; Fri, 05 Feb 2021 03:32:12 -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 :mime-version:content-transfer-encoding; bh=TcjWtfIe/4DqxFDiH3ZnjbWRc/Q9uLoPWBIP7EK7igs=; b=cRMH0ZpgZ1QPp6I+I6Si7a5slljLPHS1a3V9FuKsGa46Q0rPRGy9mvg3APihY2YB+A KCDYEcMr1Jdb773tIBqLP4eJbdTkuPmRxFUUjsGAx81i2Qvobk27GzRWyFcW7R72iPSW uVetUQymlCyALAieNibS0R0NssxKhOhX3wdG2GRTHsibRHc8Qz0FegXp6uGz+oJpnkT6 2EqFTQPJXQGY/xKJS+Kd0QUghJYDsNzsa0FJYwNqRWVK7DdNvRdepT4XiKBQIRI9RXam vWY/K/vLZK3btBhgZqwwILSwHCZDXMkWYprDDqLYTs5UsDf5Iv7zQ5MwlbPMZDw/jgPQ JQ8Q== 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:mime-version:content-transfer-encoding; bh=TcjWtfIe/4DqxFDiH3ZnjbWRc/Q9uLoPWBIP7EK7igs=; b=dtMs1i/CsAWJTooG8GO/Nu7eHT7bGmZLGMVD29LrSLV1LeIScZA7vXk3aNizUFF118 HD3CFO9QaLQepSMm9/FdT2p4JkgIPW0PULg7Z0PoR5OMhtw8usMU35+nS1rOa6EDua1J re3XKoEvc+dP01L3sqsUWs37xF8/KJrhunMjAJ7d6kThCE6NbSLNSp9KP2JunAWafii7 /XdRhC3LIPmD5H2wlWiWJzuRD3ekJ+x5rI5prJTliDNqW/3wajOs073QbIEfdvdMv2lO aQGvbI5GqSREIzq57qYR6XeZV8xvX7iUt3uN+npEE7ZTAmEmJ9r3NCcA2oVw11ktntl1 Pk0A== X-Gm-Message-State: AOAM532Z6T9qw0N3VipR88XtTD676R2ZeccnHNXLVgMI/DwORs5vtZ1+ ynYPxHrhQnkUzHzX9W8sJNe83odu5oHCn6y3 X-Google-Smtp-Source: ABdhPJyfZVQ069H++pYePSSB3uekfPHwid+L7bolxwg4ookbPcyod77fGXLts7FQgUbyeJ1IuWSeDQ== X-Received: by 2002:a5d:62c4:: with SMTP id o4mr4612233wrv.292.1612524732288; Fri, 05 Feb 2021 03:32:12 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id m6sm8009869wmq.13.2021.02.05.03.32.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:32:11 -0800 (PST) From: luca.boccassi@gmail.com To: Huisong Li Cc: Lijun Ou , dpdk stable Date: Fri, 5 Feb 2021 11:17:00 +0000 Message-Id: <20210205111920.1272063-134-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hns3: fix error code in xstats' has been queued to stable release 20.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/d7c724f1c3448932485175fb9d0dac65b86a89ef Thanks. Luca Boccassi --- >From d7c724f1c3448932485175fb9d0dac65b86a89ef Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Wed, 6 Jan 2021 11:46:29 +0800 Subject: [PATCH] net/hns3: fix error code in xstats [ upstream commit dcb33fd7602408dbb7c3bc78537667b3ee33e05c ] The ethdev API has processed the failure to obtain xstats statistics. Therefore, driver should return an error code instead of 0 in 'hns3_dev_xstats_get' API. Fixes: 8839c5e202f3 ("net/hns3: support device stats") Signed-off-by: Huisong Li Signed-off-by: Lijun Ou --- drivers/net/hns3/hns3_stats.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/hns3/hns3_stats.c b/drivers/net/hns3/hns3_stats.c index 1597af3545..42ec9b870f 100644 --- a/drivers/net/hns3/hns3_stats.c +++ b/drivers/net/hns3/hns3_stats.c @@ -739,9 +739,9 @@ hns3_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats, if (!hns->is_vf) { /* Update Mac stats */ ret = hns3_query_update_mac_stats(dev); - if (ret) { + if (ret < 0) { hns3_err(hw, "Update Mac stats fail : %d", ret); - return 0; + return ret; } /* Get MAC stats from hw->hw_xstats.mac_stats struct */ -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:35.166380777 +0000 +++ 0134-net-hns3-fix-error-code-in-xstats.patch 2021-02-05 11:18:29.010694996 +0000 @@ -1 +1 @@ -From dcb33fd7602408dbb7c3bc78537667b3ee33e05c Mon Sep 17 00:00:00 2001 +From d7c724f1c3448932485175fb9d0dac65b86a89ef Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit dcb33fd7602408dbb7c3bc78537667b3ee33e05c ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org