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 8ADE7A0543 for ; Sat, 5 Nov 2022 18:11:52 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 84C17427EB; Sat, 5 Nov 2022 18:11:52 +0100 (CET) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mails.dpdk.org (Postfix) with ESMTP id 1033D400D5 for ; Sat, 5 Nov 2022 18:11:52 +0100 (CET) Received: by mail-wr1-f51.google.com with SMTP id z14so10886000wrn.7 for ; Sat, 05 Nov 2022 10:11:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fQ1/7O2XEyt6Z754n8Knu3zGiBVo4hfb5SUuDyV0VwU=; b=iyoc8jTM5Afg6pIw81nXWzP8Cv9uE+CkVFWXVC9XguASE22Il1tquyYnMDCA4MYp9M ekDqsQ8lwpy6fwdo4m6wOcHMWYDbBYSWPUA13TGoBvqtVAdu25PnI6waLh/9wwFzHtgK Eb1sCaFqrj/+mO8BucGBfH++vYMHY2DnBlXqcXEbU8pCGhD+b3FnPPFWJaPp22+30DCw nLKb2S96TU5tuuDC+JKXqY3naIy6tJY9CGMpQ6gR26MOdAo+BG0kY6y/eN4p8Z7Quhii DXVwi6lUEXuxPlIkrBg49IJos2lhRVkr8nI0ECcEQKvfLQ0xB9W8Sd6WFgQiL3oAWu0v U0dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fQ1/7O2XEyt6Z754n8Knu3zGiBVo4hfb5SUuDyV0VwU=; b=ld4GpFKYZZV0VVna8ABU5wUmpo1gmDJpWrDnGCPbL4YkK7QpjknoHqBfByNmfG/PeS omGSxvCBsq/Qzn4xB2U5Fyb7LzGxaN4hfU5UK1inXMVepVsjjPPf+QbPNktert3rHbNB gO2gtx3hL5opdtYfM0LhXuVaBpqw6OgmtC4Vmuq7cZdKBbznLJU3gV32UsXFfmu8kCcG cew9jdWa/tkhjlhrcytAnK+LViLKXmBkP5T6x9Rfr95/7BHQA4YqwWjB2XjAaxHGDEIm +94XyywUPau987xoOjPW0xNSgvZzXWeno/2rF0vjvkkMwoEcJU8wkzsxWUPr5KISUW6J Gsjg== X-Gm-Message-State: ACrzQf0ue2u9jRSfce3i58CN/W1d8G74BGZ9t250m+FNaM30bDW5rvc9 J1IV9LEY/yIxTG6JGbFagHo= X-Google-Smtp-Source: AMsMyM7w5VdVsRO9rLdQK8dowODGsWyBjG5sufRm8yUszXVLgdpVDR63uUP0lvJhNs482SwS4DmvDA== X-Received: by 2002:adf:fa83:0:b0:236:a97d:693c with SMTP id h3-20020adffa83000000b00236a97d693cmr25503952wrr.108.1667668311695; Sat, 05 Nov 2022 10:11:51 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id k28-20020a5d525c000000b0022e653f5abbsm2549270wrc.69.2022.11.05.10.11.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Nov 2022 10:11:51 -0700 (PDT) From: luca.boccassi@gmail.com To: David Marchand Cc: Sunil Kumar Kori , dpdk stable Subject: patch 'trace: fix mode change' has been queued to stable release 20.11.7 Date: Sat, 5 Nov 2022 17:11:01 +0000 Message-Id: <20221105171146.1520039-2-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221105171146.1520039-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-100-luca.boccassi@gmail.com> <20221105171146.1520039-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 20.11.7 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/07/22. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/7c1e74d8b76d81854c1dde35b809200157f33346 Thanks. Luca Boccassi --- >From 7c1e74d8b76d81854c1dde35b809200157f33346 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 15 Sep 2022 10:20:55 +0200 Subject: [PATCH] trace: fix mode change [ upstream commit 15596638721b3d26bdadb5f757402a2942b735ad ] The API does not state that changing mode should be refused if no trace point is enabled. Remove this limitation. Fixes: 84c4fae4628f ("trace: implement operation APIs") Signed-off-by: David Marchand Acked-by: Sunil Kumar Kori --- app/test/test_trace.c | 3 --- lib/librte_eal/common/eal_common_trace.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/app/test/test_trace.c b/app/test/test_trace.c index 0f9df83c40..acf32d5082 100644 --- a/app/test/test_trace.c +++ b/app/test/test_trace.c @@ -101,9 +101,6 @@ test_trace_mode(void) current = rte_trace_mode_get(); - if (!rte_trace_is_enabled()) - return TEST_SKIPPED; - rte_trace_mode_set(RTE_TRACE_MODE_DISCARD); if (rte_trace_mode_get() != RTE_TRACE_MODE_DISCARD) goto failed; diff --git a/lib/librte_eal/common/eal_common_trace.c b/lib/librte_eal/common/eal_common_trace.c index 080278333d..3f4b5c5876 100644 --- a/lib/librte_eal/common/eal_common_trace.c +++ b/lib/librte_eal/common/eal_common_trace.c @@ -127,9 +127,6 @@ rte_trace_mode_set(enum rte_trace_mode mode) { struct trace_point *tp; - if (!rte_trace_is_enabled()) - return; - STAILQ_FOREACH(tp, &tp_list, next) trace_mode_set(tp->handle, mode); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-05 17:11:08.986275734 +0000 +++ 0002-trace-fix-mode-change.patch 2022-11-05 17:11:08.558940152 +0000 @@ -1 +1 @@ -From 15596638721b3d26bdadb5f757402a2942b735ad Mon Sep 17 00:00:00 2001 +From 7c1e74d8b76d81854c1dde35b809200157f33346 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 15596638721b3d26bdadb5f757402a2942b735ad ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -15,2 +16,2 @@ - app/test/test_trace.c | 3 --- - lib/eal/common/eal_common_trace.c | 3 --- + app/test/test_trace.c | 3 --- + lib/librte_eal/common/eal_common_trace.c | 3 --- @@ -20 +21 @@ -index 76af79162b..44ac38a4fa 100644 +index 0f9df83c40..acf32d5082 100644 @@ -23 +24 @@ -@@ -126,9 +126,6 @@ test_trace_mode(void) +@@ -101,9 +101,6 @@ test_trace_mode(void) @@ -33,4 +34,4 @@ -diff --git a/lib/eal/common/eal_common_trace.c b/lib/eal/common/eal_common_trace.c -index d5dbc7d667..1b86f5d2d2 100644 ---- a/lib/eal/common/eal_common_trace.c -+++ b/lib/eal/common/eal_common_trace.c +diff --git a/lib/librte_eal/common/eal_common_trace.c b/lib/librte_eal/common/eal_common_trace.c +index 080278333d..3f4b5c5876 100644 +--- a/lib/librte_eal/common/eal_common_trace.c ++++ b/lib/librte_eal/common/eal_common_trace.c