From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id E4CD7A0527 for ; Mon, 9 Nov 2020 19:45:11 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D7AFD69C8; Mon, 9 Nov 2020 19:45:10 +0100 (CET) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by dpdk.org (Postfix) with ESMTP id 890436883 for ; Mon, 9 Nov 2020 19:45:09 +0100 (CET) Received: by mail-wm1-f48.google.com with SMTP id s13so439392wmh.4 for ; Mon, 09 Nov 2020 10:45:09 -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=+6buaysTDkUUpZixv5gnPSUSaIw/Rt7ICBmR8l+6Ay8=; b=JnGgleyVoD1KibGWhgOmC6g1uBDeD5uFlqvZx+/+cQ5dOrBA89UxZdEAVMDDjTpD+v m2tu9VcClG4Yep+LAAFMZ381nga0QiFvUIVpTMbr3JGn8clQ6PSheR+6c2rQZANWnr3h AogVjKA0r28vxQuddj7CB+r1XFyhoGmwh3taK4CtLGrD1xquUOOCN3q7i1VhCTaJ7hCd oqolMQ06miHPtOryJzCS5EhIjjyAgC4cRDVZVTqVTtDGxTkBi3G8Ie+mAy9YF7LHPOMb 6CVbilmO4yr6QHAzEbcuKd5cPRlIFF17QlK2D5DX1f2dNYQjS0JHs0VS+2jtLBN9vtmg N96A== 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=+6buaysTDkUUpZixv5gnPSUSaIw/Rt7ICBmR8l+6Ay8=; b=PdqmWFGnvjZL3sbP5VftoNR3qdeViSdFJlaL6Lv0JmstGdvAHBPdq+dcZ6OkcXUhL+ LH1+srU9KV+Q41jaD4x5JNpLqyazeCxiTum/piKiJYADEv5y4P9/+RXV92jU9X732Ypz 0x/sJnFz8UatiaEmhCk0Nl/zaprNNWdYlwiPnCJ9TlZFCg4Ut1FvyHCU9YXr/XouHfQT qUrCvkirfgIXOuMnsIZJjA3Z8a2Lfxk7nWcjHDkY/d+M8UQlPZsU/LfZiJ5ULIytZyEp SulLyuaAAg/DUh708smvmjr9YkporrArzXXn+inRWylMJ4uv40mnP/lfdDfyASmNzKNK ximw== X-Gm-Message-State: AOAM530ob6U2mRTsV7NPuTctOWwrKxyMANLrC06Qq06BHyyj3xkjNzzh zVJTGxX5jZRB3rf+pcXOEbEzSe7rJaMs0YBY X-Google-Smtp-Source: ABdhPJyfKtBt6z8xN/e/pdN3qGKGJl9lN1xh9dZ+z+KVYXKhCsD/l3T8zphf75n2uvzXdf3CFEGV4A== X-Received: by 2002:a05:600c:2048:: with SMTP id p8mr532649wmg.165.1604947508319; Mon, 09 Nov 2020 10:45:08 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id t6sm13951860wrp.68.2020.11.09.10.45.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 10:45:07 -0800 (PST) From: luca.boccassi@gmail.com To: Michal Krawczyk Cc: Igor Chauskin , Guy Tzalik , dpdk stable Date: Mon, 9 Nov 2020 18:40:55 +0000 Message-Id: <20201109184111.3463090-67-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201109184111.3463090-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-207-luca.boccassi@gmail.com> <20201109184111.3463090-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ena: fix getting xstats global stats offset' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/11/20. 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/a9009414896e9aa0d9dd000f9e263908fd223dd7 Thanks. Luca Boccassi --- >From a9009414896e9aa0d9dd000f9e263908fd223dd7 Mon Sep 17 00:00:00 2001 From: Michal Krawczyk Date: Fri, 30 Oct 2020 12:31:16 +0100 Subject: [PATCH] net/ena: fix getting xstats global stats offset [ upstream commit 493107fd83a2848025dd42db67764bb0dc7943e0 ] There was a bug in a code, which was reading stat_offset value from the ena_stats_rx_strings array instead of ena_stats_global_strings. It wasn't causing real problems just because ena_stats_rx_strings was not smaller than ena_stats_global_strings and both arrays hold the same offsets. Fixes: 7830e905b7c9 ("net/ena: expose extended stats") Signed-off-by: Michal Krawczyk Reviewed-by: Igor Chauskin Reviewed-by: Guy Tzalik --- drivers/net/ena/ena_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index e8753ce010..a90d17ccc4 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -2479,7 +2479,7 @@ static int ena_xstats_get(struct rte_eth_dev *dev, return 0; for (stat = 0; stat < ENA_STATS_ARRAY_GLOBAL; stat++, count++) { - stat_offset = ena_stats_rx_strings[stat].stat_offset; + stat_offset = ena_stats_global_strings[stat].stat_offset; stats_begin = &adapter->dev_stats; xstats[count].id = count; -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-09 18:40:13.699734643 +0000 +++ 0067-net-ena-fix-getting-xstats-global-stats-offset.patch 2020-11-09 18:40:11.207312465 +0000 @@ -1 +1 @@ -From 493107fd83a2848025dd42db67764bb0dc7943e0 Mon Sep 17 00:00:00 2001 +From a9009414896e9aa0d9dd000f9e263908fd223dd7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 493107fd83a2848025dd42db67764bb0dc7943e0 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index c513faf202..7ab9b93ba9 100644 +index e8753ce010..a90d17ccc4 100644 @@ -27 +28 @@ -@@ -2724,7 +2724,7 @@ static int ena_xstats_get(struct rte_eth_dev *dev, +@@ -2479,7 +2479,7 @@ static int ena_xstats_get(struct rte_eth_dev *dev,