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 C78D942CBC for ; Thu, 15 Jun 2023 03:33:24 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C1D5242D10; Thu, 15 Jun 2023 03:33:24 +0200 (CEST) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mails.dpdk.org (Postfix) with ESMTP id 7ECE540DDA for ; Thu, 15 Jun 2023 03:33:23 +0200 (CEST) Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-311167ba376so48659f8f.1 for ; Wed, 14 Jun 2023 18:33:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686792803; x=1689384803; 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=rtJmUTIqFYmkpxmP4l7n3RtDOy6+CmFHT+wsTjIJEoI=; b=qloYQQvl1NG8GI6ehXMEPTIgRhd76mO2Pwho0lN7sMl6JTipVYJlGPgBX2Uub/WrK3 sSbHValruhWhNwpa59IO9SWEDvZXrP05MFLdt+06aLlLTx4MjAZ3bqeRPMyy3nQNcHpk IuP9VkSDDyTx3HkKhZv0HeJfStaXcTe7Rl0Ujz6MaxwG/4w0nivo+YkrG8Hl/fcJUtx/ HQTE86Js9nPopXwNaUX8cuP+PRSKSk9IZJbpvkMNf8p4ynZa7hFZ9jbvUEFf6PX+BBVM gAti6a4jkB7FP3kg82QEtNtZzNQMFGxPoXaIARnCxkQjpswXxep1jw3uXGqRf6srlPWw v5BA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686792803; x=1689384803; 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=rtJmUTIqFYmkpxmP4l7n3RtDOy6+CmFHT+wsTjIJEoI=; b=MgDDOec6WrqoWvMPMbRCtRA/iCpoW5pdN/bbOjQyYSen0x/IuaUHKwJSRC6Hf+hVHJ NcNat8+bXCWrJHUjt+yMien5/mjR2yHmouoIRPHekvz53GS6sCoehYgmPazcKb/KTTXb UcIH8bFF+v02aATy1/C7fnSruvL6Av/SNUvb51AWiSEvdj/79ShH5IwDueiOAWNcIJq6 6XNTu+c48Khv/f9yz5qHXlzEfHmAbjRSHtoHuGwRSdiHC5TPJn6q9khqEXPAH5g+yNIC Y3E+ssnNk8wNYDGklQGGgy7aPcHsbxL+iQsw+7Ek4ex+3OgPgDc2Kf5ERpX0ama6Ym+l pclg== X-Gm-Message-State: AC+VfDxgQIE5jwd/q1W7vNAKCZwl9rJ1Ydt7JymdtFPgzKRfCrDBAQtV lgX8eYLNL/CcU17bdeHYbbE= X-Google-Smtp-Source: ACHHUZ582R0zNFmsEAwGQ5apFejHQt1e2/bQgUzWqHyFPMCYDp6vxUYfGp3M6ZtVPi3rtumSb3kx6w== X-Received: by 2002:a5d:43c7:0:b0:30a:e165:e68e with SMTP id v7-20020a5d43c7000000b0030ae165e68emr9486594wrr.27.1686792803133; Wed, 14 Jun 2023 18:33:23 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id k10-20020adff5ca000000b003077a19cf75sm19495013wrp.60.2023.06.14.18.33.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 18:33:22 -0700 (PDT) From: luca.boccassi@gmail.com To: Ruifeng Wang Cc: Feifei Wang , Anatoly Burakov , dpdk stable Subject: patch 'test/malloc: fix statistics checks' has been queued to stable release 20.11.9 Date: Thu, 15 Jun 2023 02:32:05 +0100 Message-Id: <20230615013258.1439718-10-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230615013258.1439718-1-luca.boccassi@gmail.com> References: <20230615013258.1439718-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.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/17/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/60a90b6cede193596c5314744d3d9b6c4f73d565 Thanks. Luca Boccassi --- >From 60a90b6cede193596c5314744d3d9b6c4f73d565 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 @@ -301,11 +301,11 @@ test_multi_alloc_statistics(void) rte_malloc_get_socket_stats(socket,&post_stats); /* 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; } @@ -362,11 +362,11 @@ test_multi_alloc_statistics(void) return -1; } - 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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-15 01:56:35.266858267 +0100 +++ 0010-test-malloc-fix-statistics-checks.patch 2023-06-15 01:56:34.507539992 +0100 @@ -1 +1 @@ -From 19606f83e6c1dffea9bda42a792e1cbbc6d5a043 Mon Sep 17 00:00:00 2001 +From 60a90b6cede193596c5314744d3d9b6c4f73d565 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 @@ -@@ -302,11 +302,11 @@ test_multi_alloc_statistics(void) +@@ -301,11 +301,11 @@ test_multi_alloc_statistics(void) @@ -40 +41 @@ -@@ -363,11 +363,11 @@ test_multi_alloc_statistics(void) +@@ -362,11 +362,11 @@ test_multi_alloc_statistics(void)