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 7EBC642ECF for ; Thu, 20 Jul 2023 17:22:20 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7A45942D3D; Thu, 20 Jul 2023 17:22:20 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 97D5842D37 for ; Thu, 20 Jul 2023 17:22:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2g7QLH7HHFnAe3iZEEsNy0Ja/XBJfYEnbGb0LgNDYQY=; b=LJ2IhcjdZlFLX2iEnpnArz+ddhqHb3aWAgPIma8svDoFm1Z6JYjT1bkxd8YgNB0DsLrIYa omh0ssREG4Ai+K3pzGofYv8a9e60/iobGfWlgAyeMZAeD2kClRrLqAt9hb8ITS+esUHDuL JUJaplyi8YdeL05fj7vWl88DknHIs34= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-323-4slv0RXXMeCmbepobAnnmA-1; Thu, 20 Jul 2023 11:20:45 -0400 X-MC-Unique: 4slv0RXXMeCmbepobAnnmA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9628E3810795; Thu, 20 Jul 2023 15:20:12 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6F76C492C13; Thu, 20 Jul 2023 15:20:11 +0000 (UTC) From: Kevin Traynor To: Ruifeng Wang Cc: Feifei Wang , Anatoly Burakov , dpdk stable Subject: patch 'test/malloc: fix statistics checks' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:17:23 +0100 Message-ID: <20230720151942.262154-12-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/23. 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/c2f6df57e20bf422f49890711f8fb62ea9f178fd Thanks. Kevin --- >From c2f6df57e20bf422f49890711f8fb62ea9f178fd Mon Sep 17 00:00:00 2001 From: Ruifeng Wang Date: Fri, 19 May 2023 12:29:23 +0800 Subject: [PATCH] test/malloc: fix statistics checks [ upstream commit 19606f83e6c1dffea9bda42a792e1cbbc6d5a043 ] The case expects all stats to be equal. Therefore the negative conditions in check should be logically or'ed. Fixes: a40a1f8231b4 ("app: various tests update") Signed-off-by: Ruifeng Wang Reviewed-by: Feifei Wang Acked-by: Anatoly Burakov --- app/test/test_malloc.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/test/test_malloc.c b/app/test/test_malloc.c index cf1af6285f..9008038bfa 100644 --- a/app/test/test_malloc.c +++ b/app/test/test_malloc.c @@ -302,9 +302,9 @@ test_multi_alloc_statistics(void) /* Check statistics reported are correct */ /* All post stats should be equal to pre stats after alloc freed */ - if ((post_stats.heap_totalsz_bytes != pre_stats.heap_totalsz_bytes) && - (post_stats.heap_freesz_bytes!=pre_stats.heap_freesz_bytes) && - (post_stats.heap_allocsz_bytes!=pre_stats.heap_allocsz_bytes)&& - (post_stats.alloc_count!=pre_stats.alloc_count)&& - (post_stats.free_count!=pre_stats.free_count)) { + if ((post_stats.heap_totalsz_bytes != pre_stats.heap_totalsz_bytes) || + (post_stats.heap_freesz_bytes != pre_stats.heap_freesz_bytes) || + (post_stats.heap_allocsz_bytes != pre_stats.heap_allocsz_bytes) || + (post_stats.alloc_count != pre_stats.alloc_count) || + (post_stats.free_count != pre_stats.free_count)) { printf("Malloc statistics are incorrect - freed alloc\n"); return -1; @@ -363,9 +363,9 @@ test_multi_alloc_statistics(void) } - if ((post_stats.heap_totalsz_bytes != pre_stats.heap_totalsz_bytes) && - (post_stats.heap_freesz_bytes!=pre_stats.heap_freesz_bytes) && - (post_stats.heap_allocsz_bytes!=pre_stats.heap_allocsz_bytes)&& - (post_stats.alloc_count!=pre_stats.alloc_count)&& - (post_stats.free_count!=pre_stats.free_count)) { + if ((post_stats.heap_totalsz_bytes != pre_stats.heap_totalsz_bytes) || + (post_stats.heap_freesz_bytes != pre_stats.heap_freesz_bytes) || + (post_stats.heap_allocsz_bytes != pre_stats.heap_allocsz_bytes) || + (post_stats.alloc_count != pre_stats.alloc_count) || + (post_stats.free_count != pre_stats.free_count)) { printf("Malloc statistics are incorrect - freed alloc\n"); return -1; -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:17:56.698290928 +0100 +++ 0012-test-malloc-fix-statistics-checks.patch 2023-07-20 16:17:54.452749654 +0100 @@ -1 +1 @@ -From 19606f83e6c1dffea9bda42a792e1cbbc6d5a043 Mon Sep 17 00:00:00 2001 +From c2f6df57e20bf422f49890711f8fb62ea9f178fd Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 19606f83e6c1dffea9bda42a792e1cbbc6d5a043 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index f144b89d88..ff081dd931 100644 +index cf1af6285f..9008038bfa 100644 @@ -23 +24 @@ -@@ -303,9 +303,9 @@ test_multi_alloc_statistics(void) +@@ -302,9 +302,9 @@ test_multi_alloc_statistics(void) @@ -38 +39 @@ -@@ -364,9 +364,9 @@ test_multi_alloc_statistics(void) +@@ -363,9 +363,9 @@ test_multi_alloc_statistics(void)