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 54F88A04C7; Mon, 14 Sep 2020 16:34:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BBC1B1C126; Mon, 14 Sep 2020 16:34:26 +0200 (CEST) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by dpdk.org (Postfix) with ESMTP id 206741C124; Mon, 14 Sep 2020 16:34:25 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9A31D106F; Mon, 14 Sep 2020 07:34:24 -0700 (PDT) Received: from net-arm-n1sdp.shanghai.arm.com (net-arm-n1sdp.shanghai.arm.com [10.169.208.213]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 0BC6E3F718; Mon, 14 Sep 2020 07:34:21 -0700 (PDT) From: Feifei Wang To: Honnappa Nagarahalli , Konstantin Ananyev , Olivier Matz , Gavin Hu Cc: dev@dpdk.org, nd@arm.com, Feifei Wang , stable@dpdk.org Date: Mon, 14 Sep 2020 09:33:48 -0500 Message-Id: <20200914143350.18650-6-feifei.wang2@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200914143350.18650-1-feifei.wang2@arm.com> References: <20200729063105.11299-1-feifei.wang2@arm.com> <20200914143350.18650-1-feifei.wang2@arm.com> Subject: [dpdk-dev] [PATCH v4 5/7] test/ring: fix wrong size used in memcmp X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" When using memcmp function to check data, the third param should be the size of all elements, rather than the number of the elements. Fixes: a9fe152363e2 ("test/ring: add custom element size functional tests") Cc: honnappa.nagarahalli@arm.com Cc: stable@dpdk.org Signed-off-by: Feifei Wang Reviewed-by: Ruifeng Wang Reviewed-by: Phil Yang Reviewed-by: Dharmik Thakkar Reviewed-by: Honnappa Nagarahalli --- app/test/test_ring.c | 49 +++++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/app/test/test_ring.c b/app/test/test_ring.c index 811adc523..06498c337 100644 --- a/app/test/test_ring.c +++ b/app/test/test_ring.c @@ -444,7 +444,12 @@ test_ring_burst_bulk_tests1(unsigned int test_idx) TEST_RING_VERIFY(rte_ring_empty(r)); /* check data */ - TEST_RING_VERIFY(memcmp(src, dst, rsz) == 0); + if (esize[i] == -1) { + TEST_RING_VERIFY(memcmp(src, dst, + rsz * sizeof(void *)) == 0); + } else + TEST_RING_VERIFY(memcmp(src, dst, + rsz * esize[i]) == 0); } /* Free memory before test completed */ @@ -538,9 +543,11 @@ test_ring_burst_bulk_tests2(unsigned int test_idx) cur_dst = test_ring_inc_ptr(cur_dst, esize[i], MAX_BULK); /* check data */ - if (memcmp(src, dst, cur_dst - dst)) { - rte_hexdump(stdout, "src", src, cur_src - src); - rte_hexdump(stdout, "dst", dst, cur_dst - dst); + if (memcmp(src, dst, RTE_PTR_DIFF(cur_dst, dst))) { + rte_hexdump(stdout, "src", src, + RTE_PTR_DIFF(cur_src, src)); + rte_hexdump(stdout, "dst", dst, + RTE_PTR_DIFF(cur_dst, dst)); printf("data after dequeue is not the same\n"); goto fail; } @@ -614,9 +621,11 @@ test_ring_burst_bulk_tests3(unsigned int test_idx) } /* check data */ - if (memcmp(src, dst, cur_dst - dst)) { - rte_hexdump(stdout, "src", src, cur_src - src); - rte_hexdump(stdout, "dst", dst, cur_dst - dst); + if (memcmp(src, dst, RTE_PTR_DIFF(cur_dst, dst))) { + rte_hexdump(stdout, "src", src, + RTE_PTR_DIFF(cur_src, src)); + rte_hexdump(stdout, "dst", dst, + RTE_PTR_DIFF(cur_dst, dst)); printf("data after dequeue is not the same\n"); goto fail; } @@ -747,9 +756,11 @@ test_ring_burst_bulk_tests4(unsigned int test_idx) goto fail; /* check data */ - if (memcmp(src, dst, cur_dst - dst)) { - rte_hexdump(stdout, "src", src, cur_src - src); - rte_hexdump(stdout, "dst", dst, cur_dst - dst); + if (memcmp(src, dst, RTE_PTR_DIFF(cur_dst, dst))) { + rte_hexdump(stdout, "src", src, + RTE_PTR_DIFF(cur_src, src)); + rte_hexdump(stdout, "dst", dst, + RTE_PTR_DIFF(cur_dst, dst)); printf("data after dequeue is not the same\n"); goto fail; } @@ -857,9 +868,9 @@ test_ring_basic_ex(void) } /* check data */ - if (memcmp(src, dst, cur_src - src)) { - rte_hexdump(stdout, "src", src, cur_src - src); - rte_hexdump(stdout, "dst", dst, cur_dst - dst); + if (memcmp(src, dst, RTE_PTR_DIFF(cur_src, src))) { + rte_hexdump(stdout, "src", src, RTE_PTR_DIFF(cur_src, src)); + rte_hexdump(stdout, "dst", dst, RTE_PTR_DIFF(cur_dst, dst)); printf("data after dequeue is not the same\n"); goto fail_test; } @@ -909,9 +920,9 @@ test_ring_basic_ex(void) cur_dst = test_ring_inc_ptr(cur_dst, esize[i], 2); /* check data */ - if (memcmp(src, dst, cur_dst - dst)) { - rte_hexdump(stdout, "src", src, cur_src - src); - rte_hexdump(stdout, "dst", dst, cur_dst - dst); + if (memcmp(src, dst, RTE_PTR_DIFF(cur_dst, dst))) { + rte_hexdump(stdout, "src", src, RTE_PTR_DIFF(cur_src, src)); + rte_hexdump(stdout, "dst", dst, RTE_PTR_DIFF(cur_dst, dst)); printf("data after dequeue is not the same\n"); goto fail_test; } @@ -1047,9 +1058,9 @@ test_ring_with_exact_size(void) } /* check data */ - if (memcmp(src, dst, cur_dst - dst)) { - rte_hexdump(stdout, "src", src, cur_src - src); - rte_hexdump(stdout, "dst", dst, cur_dst - dst); + if (memcmp(src, dst, RTE_PTR_DIFF(cur_dst, dst))) { + rte_hexdump(stdout, "src", src, RTE_PTR_DIFF(cur_src, src)); + rte_hexdump(stdout, "dst", dst, RTE_PTR_DIFF(cur_dst, dst)); printf("data after dequeue is not the same\n"); goto test_fail; } -- 2.17.1