diff mbox series

[v2,6/9] trace: fix race in debug dump

Message ID	20221004094418.196544-7-david.marchand@redhat.com (mailing list archive)
State	Superseded, archived
Delegated to:	Thomas Monjalon
Headers	From: David Marchand <david.marchand@redhat.com> To: dev@dpdk.org Cc: skori@mavell.com, jerinj@marvell.com, stable@dpdk.org, Sunil Kumar Kori <skori@marvell.com> Subject: [PATCH v2 6/9] trace: fix race in debug dump Date: Tue, 4 Oct 2022 11:44:15 +0200 Message-Id: <20221004094418.196544-7-david.marchand@redhat.com> In-Reply-To: <20221004094418.196544-1-david.marchand@redhat.com> References: <20220921120359.2201131-1-david.marchand@redhat.com> <20221004094418.196544-1-david.marchand@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true Precedence: list Errors-To: dev-bounces@dpdk.org
Series	Trace subsystem fixes \| [v2,0/9] Trace subsystem fixes [v2,1/9] trace: fix mode for new trace point [v2,2/9] trace: fix mode change [v2,3/9] trace: fix leak with regexp [v2,4/9] trace: rework loop on trace points [v2,5/9] trace: fix dynamically enabling trace points [v2,6/9] trace: fix race in debug dump [v2,7/9] trace: fix metadata dump [v2,8/9] trace: remove limitation on trace point name [v2,9/9] trace: remove limitation on directory

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

David Marchand Oct. 4, 2022, 9:44 a.m. UTC

  trace->nb_trace_mem_list access must be under trace->lock to avoid
races with threads allocating/freeing their trace buffers.

Fixes: f6b2d65dcd5d ("trace: implement debug dump")
Cc: stable@dpdk.org

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 lib/eal/common/eal_common_trace.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Sunil Kumar Kori Oct. 12, 2022, 9:25 a.m. UTC | #1

> -----Original Message-----
> From: David Marchand <david.marchand@redhat.com>
> Sent: Tuesday, October 4, 2022 3:14 PM
> To: dev@dpdk.org
> Cc: skori@mavell.com; Jerin Jacob Kollanukkaran <jerinj@marvell.com>;
> stable@dpdk.org; Sunil Kumar Kori <skori@marvell.com>
> Subject: [EXT] [PATCH v2 6/9] trace: fix race in debug dump
> 
> External Email
> 
> ----------------------------------------------------------------------
> trace->nb_trace_mem_list access must be under trace->lock to avoid
> races with threads allocating/freeing their trace buffers.
> 
> Fixes: f6b2d65dcd5d ("trace: implement debug dump")
> Cc: stable@dpdk.org
> 
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
>  lib/eal/common/eal_common_trace.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 

Acked-by: Sunil Kumar Kori <skori@marvell.com>

> diff --git a/lib/eal/common/eal_common_trace.c
> b/lib/eal/common/eal_common_trace.c
> index 6aa11a3b50..ec168e37b3 100644
> --- a/lib/eal/common/eal_common_trace.c
> +++ b/lib/eal/common/eal_common_trace.c
> @@ -259,10 +259,9 @@ trace_lcore_mem_dump(FILE *f)
>  	struct __rte_trace_header *header;
>  	uint32_t count;
> 
> -	if (trace->nb_trace_mem_list == 0)
> -		return;
> -
>  	rte_spinlock_lock(&trace->lock);
> +	if (trace->nb_trace_mem_list == 0)
> +		goto out;
>  	fprintf(f, "nb_trace_mem_list = %d\n", trace->nb_trace_mem_list);
>  	fprintf(f, "\nTrace mem info\n--------------\n");
>  	for (count = 0; count < trace->nb_trace_mem_list; count++) { @@ -
> 273,6 +272,7 @@ trace_lcore_mem_dump(FILE *f)
>  		header->stream_header.lcore_id,
>  		header->stream_header.thread_name);
>  	}
> +out:
>  	rte_spinlock_unlock(&trace->lock);
>  }
> 
> --
> 2.37.3

diff mbox series

Patch

diff --git a/lib/eal/common/eal_common_trace.c b/lib/eal/common/eal_common_trace.c
index 6aa11a3b50..ec168e37b3 100644
--- a/lib/eal/common/eal_common_trace.c
+++ b/lib/eal/common/eal_common_trace.c
@@ -259,10 +259,9 @@  trace_lcore_mem_dump(FILE *f)
 	struct __rte_trace_header *header;
 	uint32_t count;
 
-	if (trace->nb_trace_mem_list == 0)
-		return;
-
 	rte_spinlock_lock(&trace->lock);
+	if (trace->nb_trace_mem_list == 0)
+		goto out;
 	fprintf(f, "nb_trace_mem_list = %d\n", trace->nb_trace_mem_list);
 	fprintf(f, "\nTrace mem info\n--------------\n");
 	for (count = 0; count < trace->nb_trace_mem_list; count++) {
@@ -273,6 +272,7 @@  trace_lcore_mem_dump(FILE *f)
 		header->stream_header.lcore_id,
 		header->stream_header.thread_name);
 	}
+out:
 	rte_spinlock_unlock(&trace->lock);
 }