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 41379A04F3 for ; Thu, 19 Dec 2019 15:37:02 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 373CF1BF86; Thu, 19 Dec 2019 15:37:02 +0100 (CET) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id 64A221BF8C for ; Thu, 19 Dec 2019 15:37:01 +0100 (CET) Received: by mail-wm1-f66.google.com with SMTP id q9so5675761wmj.5 for ; Thu, 19 Dec 2019 06:37:01 -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=lToAK62FuzTGcGYIkIYw5a2aFu/MXqLvPqwZK8pzFiQ=; b=fVZevD0y2ag+o5XT+1x9JsDzEULK4FsNpjV6QJ7dojKw5V6T7ZuwtID0rkPa7LK9/G fv+JiklbJ5IrOpgR7weShwyVUiMSo1+Wqk96yA6apLcN1bYWAW7juS4JRbP6FihOkceW u6iffxq+OrWhSbUvTzKYZOFmNC07wgTQbQHKCyd3JIE+f7vC/8+KiTeB7skeDJBUysAn Y1UdHrjDa5fQshji+XrGq+GWiZ/xsf4Wijh7AljNqwVoM0s5Wl1xaJLUJlLV0MrdCZDv Fg/pah6nV8KxC5kSpArSShKIh69txJ1VxQIAsDzm16IhvHH1YHcdGAGusLP9ryCspdQx kQcQ== 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=lToAK62FuzTGcGYIkIYw5a2aFu/MXqLvPqwZK8pzFiQ=; b=slzBtqcaRCEqsVoPc/rQ6Hx+TRPDq/xnUovYYNOiFzW58xUbz34ULtfZIVMOinuDzw DZJjy+QbcZrYHQb2x3jfDf8xjWbNHV4YY+SbdKN2A1t9HYvDHFjjj2RBOCXlTusJ7kcj 00b2jMq4z6q1UETRHQdo+Z1mtOaufoeqiCzyvP0ZOonaDgQonLYx0pBB3i/SS48/DzAU XERTa59/p8Y20UHvFYiQxxeyk+I4mZ5Y8SyKYF+PjMhCk63jeSGFm9gNCFfuAX1guYLa 8L1hIdKmOgnreKkxGVC2RbYLNrG2VVL39rQEyP6Ew1DONjkWqgmm0pq7U7g1TP2FvGSc vI/A== X-Gm-Message-State: APjAAAUKV1xpanMQam4E8RBbW4wQA1/DesM5mq2Dxu4awu+BLBMpv/Bg awBPWpzcMeT+XWGHqygooCn0xGETmC0= X-Google-Smtp-Source: APXvYqyr/NAiV+iAfSeaNRkOA9JElijbkAIVLymVZ30Pgt4K2QBg/wh2hWvfQzcekjXONX9Q5ibp/A== X-Received: by 2002:a1c:28d4:: with SMTP id o203mr10412738wmo.123.1576766221141; Thu, 19 Dec 2019 06:37:01 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id n1sm6467529wrw.52.2019.12.19.06.37.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:37:00 -0800 (PST) From: luca.boccassi@gmail.com To: Gage Eads Cc: Harry van Haaren , dpdk stable Date: Thu, 19 Dec 2019 14:33:15 +0000 Message-Id: <20191219143447.21506-48-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219143447.21506-1-luca.boccassi@gmail.com> References: <20191219143447.21506-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'event/sw: fix xstats reset value' has been queued to LTS release 17.11.10 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 LTS release 17.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/21/19. 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. Thanks. Luca Boccassi --- >From ae419ec1d3a15d7bbefd31405c5f435f66be4ead Mon Sep 17 00:00:00 2001 From: Gage Eads Date: Tue, 27 Aug 2019 16:34:59 -0500 Subject: [PATCH] event/sw: fix xstats reset value [ upstream commit d02c470c87976def34bae0307736ecb9c8cac9d8 ] The sw PMD implements xstats reset by having the xstat get operations return a value to the statistic's value at the last reset. The value at the last reset is maintained in the per-xstat reset_value field, but the PMD was setting reset_value = current - reset_value instead of reset_value = current. Fixes: c1ad03df7ad5 ("event/sw: support xstats") Signed-off-by: Gage Eads Acked-by: Harry van Haaren --- drivers/event/sw/sw_evdev_xstats.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/event/sw/sw_evdev_xstats.c b/drivers/event/sw/sw_evdev_xstats.c index 61a5c33b7a..bed222f7ed 100644 --- a/drivers/event/sw/sw_evdev_xstats.c +++ b/drivers/event/sw/sw_evdev_xstats.c @@ -521,7 +521,7 @@ sw_xstats_update(struct sw_evdev *sw, enum rte_event_dev_xstats_mode mode, values[xidx] = val; if (xs->reset_allowed && reset) - xs->reset_value = val; + xs->reset_value += val; xidx++; } @@ -574,8 +574,7 @@ sw_xstats_reset_range(struct sw_evdev *sw, uint32_t start, uint32_t num) if (!xs->reset_allowed) continue; - uint64_t val = xs->fn(sw, xs->obj_idx, xs->stat, xs->extra_arg) - - xs->reset_value; + uint64_t val = xs->fn(sw, xs->obj_idx, xs->stat, xs->extra_arg); xs->reset_value = val; } } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:28.257415133 +0000 +++ 0048-event-sw-fix-xstats-reset-value.patch 2019-12-19 14:32:26.025296239 +0000 @@ -1,8 +1,10 @@ -From d02c470c87976def34bae0307736ecb9c8cac9d8 Mon Sep 17 00:00:00 2001 +From ae419ec1d3a15d7bbefd31405c5f435f66be4ead Mon Sep 17 00:00:00 2001 From: Gage Eads Date: Tue, 27 Aug 2019 16:34:59 -0500 Subject: [PATCH] event/sw: fix xstats reset value +[ upstream commit d02c470c87976def34bae0307736ecb9c8cac9d8 ] + The sw PMD implements xstats reset by having the xstat get operations return a value to the statistic's value at the last reset. The value at the last reset is maintained in the per-xstat reset_value field, but the PMD @@ -10,7 +12,6 @@ current. Fixes: c1ad03df7ad5 ("event/sw: support xstats") -Cc: stable@dpdk.org Signed-off-by: Gage Eads Acked-by: Harry van Haaren @@ -19,10 +20,10 @@ 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/event/sw/sw_evdev_xstats.c b/drivers/event/sw/sw_evdev_xstats.c -index 7a6caa64d8..90664903bf 100644 +index 61a5c33b7a..bed222f7ed 100644 --- a/drivers/event/sw/sw_evdev_xstats.c +++ b/drivers/event/sw/sw_evdev_xstats.c -@@ -491,7 +491,7 @@ sw_xstats_update(struct sw_evdev *sw, enum rte_event_dev_xstats_mode mode, +@@ -521,7 +521,7 @@ sw_xstats_update(struct sw_evdev *sw, enum rte_event_dev_xstats_mode mode, values[xidx] = val; if (xs->reset_allowed && reset) @@ -31,7 +32,7 @@ xidx++; } -@@ -544,8 +544,7 @@ sw_xstats_reset_range(struct sw_evdev *sw, uint32_t start, uint32_t num) +@@ -574,8 +574,7 @@ sw_xstats_reset_range(struct sw_evdev *sw, uint32_t start, uint32_t num) if (!xs->reset_allowed) continue;