Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 77454,
    "url": "http://patches.dpdk.org/api/patches/77454/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200911161002.19816-2-feifei.wang2@arm.com/",
    "project": {
        "id": 1,
        "url": "http://patches.dpdk.org/api/projects/1/?format=api",
        "name": "DPDK",
        "link_name": "dpdk",
        "list_id": "dev.dpdk.org",
        "list_email": "dev@dpdk.org",
        "web_url": "http://core.dpdk.org",
        "scm_url": "git://dpdk.org/dpdk",
        "webscm_url": "http://git.dpdk.org/dpdk",
        "list_archive_url": "https://inbox.dpdk.org/dev",
        "list_archive_url_format": "https://inbox.dpdk.org/dev/{}",
        "commit_url_format": ""
    },
    "msgid": "<20200911161002.19816-2-feifei.wang2@arm.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20200911161002.19816-2-feifei.wang2@arm.com",
    "date": "2020-09-11T16:09:57",
    "name": "[v3,1/6] test/ring: add check to validate dequeued objects",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "bbe7d10d98887bd741d3483c5172187ad2523027",
    "submitter": {
        "id": 1771,
        "url": "http://patches.dpdk.org/api/people/1771/?format=api",
        "name": "Feifei Wang",
        "email": "feifei.wang2@arm.com"
    },
    "delegate": {
        "id": 24651,
        "url": "http://patches.dpdk.org/api/users/24651/?format=api",
        "username": "dmarchand",
        "first_name": "David",
        "last_name": "Marchand",
        "email": "david.marchand@redhat.com"
    },
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200911161002.19816-2-feifei.wang2@arm.com/mbox/",
    "series": [
        {
            "id": 12156,
            "url": "http://patches.dpdk.org/api/series/12156/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=12156",
            "date": "2020-09-11T16:09:56",
            "name": "fix wrong passed pointer and add check",
            "version": 3,
            "mbox": "http://patches.dpdk.org/series/12156/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/77454/comments/",
    "check": "success",
    "checks": "http://patches.dpdk.org/api/patches/77454/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@inbox.dpdk.org",
        "Delivered-To": "patchwork@inbox.dpdk.org",
        "Received": [
            "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id BB8DCA04BB;\n\tFri, 11 Sep 2020 18:10:35 +0200 (CEST)",
            "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id CED631C0CD;\n\tFri, 11 Sep 2020 18:10:32 +0200 (CEST)",
            "from foss.arm.com (foss.arm.com [217.140.110.172])\n by dpdk.org (Postfix) with ESMTP id 45C021C0CC\n for <dev@dpdk.org>; Fri, 11 Sep 2020 18:10:31 +0200 (CEST)",
            "from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14])\n by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B51B0106F;\n Fri, 11 Sep 2020 09:10:30 -0700 (PDT)",
            "from net-arm-n1sdp.shanghai.arm.com (net-arm-n1sdp.shanghai.arm.com\n [10.169.208.213])\n by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id C79D33F73C;\n Fri, 11 Sep 2020 09:10:28 -0700 (PDT)"
        ],
        "From": "Feifei Wang <feifei.wang2@arm.com>",
        "To": "Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>,\n Konstantin Ananyev <konstantin.ananyev@intel.com>",
        "Cc": "dev@dpdk.org,\n\tnd@arm.com,\n\tFeifei Wang <feifei.wang2@arm.com>",
        "Date": "Fri, 11 Sep 2020 11:09:57 -0500",
        "Message-Id": "<20200911161002.19816-2-feifei.wang2@arm.com>",
        "X-Mailer": "git-send-email 2.17.1",
        "In-Reply-To": "<20200911161002.19816-1-feifei.wang2@arm.com>",
        "References": "<20200729063105.11299-1-feifei.wang2@arm.com>\n <20200911161002.19816-1-feifei.wang2@arm.com>",
        "Subject": "[dpdk-dev] [PATCH v3 1/6] test/ring: add check to validate dequeued\n\tobjects",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://mails.dpdk.org/archives/dev/>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "Add check in test_ring_basic_ex and test_ring_with_exact_size for single\nelement enqueue and dequeue operations to validate the dequeued objects.\n\nSigned-off-by: Feifei Wang <feifei.wang2@arm.com>\nReviewed-by: Ruifeng Wang <ruifeng.wang@arm.com>\nReviewed-by: Phil Yang <phil.yang@arm.com>\nReviewed-by: Dharmik Thakkar <dharmik.thakkar@arm.com>\n---\n app/test/test_ring.c | 135 +++++++++++++++++++++++++++++++------------\n 1 file changed, 99 insertions(+), 36 deletions(-)",
    "diff": "diff --git a/app/test/test_ring.c b/app/test/test_ring.c\nindex 0ae97d341..6e48cc0b1 100644\n--- a/app/test/test_ring.c\n+++ b/app/test/test_ring.c\n@@ -780,15 +780,9 @@ test_ring_basic_ex(void)\n \tint ret = -1;\n \tunsigned int i, j;\n \tstruct rte_ring *rp = NULL;\n-\tvoid *obj = NULL;\n+\tvoid **src = NULL, **cur_src = NULL, **dst = NULL, **cur_dst = NULL;\n \n \tfor (i = 0; i < RTE_DIM(esize); i++) {\n-\t\tobj = test_ring_calloc(RING_SIZE, esize[i]);\n-\t\tif (obj == NULL) {\n-\t\t\tprintf(\"%s: failed to alloc memory\\n\", __func__);\n-\t\t\tgoto fail_test;\n-\t\t}\n-\n \t\trp = test_ring_create(\"test_ring_basic_ex\", esize[i], RING_SIZE,\n \t\t\t\t\tSOCKET_ID_ANY,\n \t\t\t\t\tRING_F_SP_ENQ | RING_F_SC_DEQ);\n@@ -797,6 +791,23 @@ test_ring_basic_ex(void)\n \t\t\tgoto fail_test;\n \t\t}\n \n+\t\t/* alloc dummy object pointers */\n+\t\tsrc = test_ring_calloc(RING_SIZE, esize[i]);\n+\t\tif (src == NULL) {\n+\t\t\tprintf(\"%s: failed to alloc src memory\\n\", __func__);\n+\t\t\tgoto fail_test;\n+\t\t}\n+\t\ttest_ring_mem_init(src, RING_SIZE, esize[i]);\n+\t\tcur_src = src;\n+\n+\t\t/* alloc some room for copied objects */\n+\t\tdst = test_ring_calloc(RING_SIZE, esize[i]);\n+\t\tif (dst == NULL) {\n+\t\t\tprintf(\"%s: failed to alloc dst memory\\n\", __func__);\n+\t\t\tgoto fail_test;\n+\t\t}\n+\t\tcur_dst = dst;\n+\n \t\tif (rte_ring_lookup(\"test_ring_basic_ex\") != rp) {\n \t\t\tprintf(\"%s: failed to find ring\\n\", __func__);\n \t\t\tgoto fail_test;\n@@ -812,8 +823,9 @@ test_ring_basic_ex(void)\n \t\t\trte_ring_free_count(rp));\n \n \t\tfor (j = 0; j < RING_SIZE; j++) {\n-\t\t\ttest_ring_enqueue(rp, obj, esize[i], 1,\n+\t\t\ttest_ring_enqueue(rp, cur_src, esize[i], 1,\n \t\t\t\tTEST_RING_THREAD_DEF | TEST_RING_ELEM_SINGLE);\n+\t\t\tcur_src = test_ring_inc_ptr(cur_src, esize[i], 1);\n \t\t}\n \n \t\tif (rte_ring_full(rp) != 1) {\n@@ -823,8 +835,9 @@ test_ring_basic_ex(void)\n \t\t}\n \n \t\tfor (j = 0; j < RING_SIZE; j++) {\n-\t\t\ttest_ring_dequeue(rp, obj, esize[i], 1,\n+\t\t\ttest_ring_dequeue(rp, cur_dst, esize[i], 1,\n \t\t\t\tTEST_RING_THREAD_DEF | TEST_RING_ELEM_SINGLE);\n+\t\t\tcur_dst = test_ring_inc_ptr(cur_dst, esize[i], 1);\n \t\t}\n \n \t\tif (rte_ring_empty(rp) != 1) {\n@@ -833,52 +846,80 @@ test_ring_basic_ex(void)\n \t\t\tgoto fail_test;\n \t\t}\n \n+\t\t/* check data */\n+\t\tif (memcmp(src, dst, cur_src - src)) {\n+\t\t\trte_hexdump(stdout, \"src\", src, cur_src - src);\n+\t\t\trte_hexdump(stdout, \"dst\", dst, cur_dst - dst);\n+\t\t\tprintf(\"data after dequeue is not the same\\n\");\n+\t\t\tgoto fail_test;\n+\t\t}\n+\n \t\t/* Following tests use the configured flags to decide\n \t\t * SP/SC or MP/MC.\n \t\t */\n+\t\t/* reset memory of dst */\n+\t\tmemset(dst, 0, RTE_PTR_DIFF(cur_src, src));\n+\n+\t\t/* reset cur_src and cur_dst */\n+\t\tcur_src = src;\n+\t\tcur_dst = dst;\n+\n \t\t/* Covering the ring burst operation */\n-\t\tret = test_ring_enqueue(rp, obj, esize[i], 2,\n+\t\tret = test_ring_enqueue(rp, cur_src, esize[i], 2,\n \t\t\t\tTEST_RING_THREAD_DEF | TEST_RING_ELEM_BURST);\n \t\tif (ret != 2) {\n \t\t\tprintf(\"%s: rte_ring_enqueue_burst fails\\n\", __func__);\n \t\t\tgoto fail_test;\n \t\t}\n+\t\tcur_src = test_ring_inc_ptr(cur_src, esize[i], 2);\n \n-\t\tret = test_ring_dequeue(rp, obj, esize[i], 2,\n+\t\tret = test_ring_dequeue(rp, cur_dst, esize[i], 2,\n \t\t\t\tTEST_RING_THREAD_DEF | TEST_RING_ELEM_BURST);\n \t\tif (ret != 2) {\n \t\t\tprintf(\"%s: rte_ring_dequeue_burst fails\\n\", __func__);\n \t\t\tgoto fail_test;\n \t\t}\n+\t\tcur_dst = test_ring_inc_ptr(cur_dst, esize[i], 2);\n \n \t\t/* Covering the ring bulk operation */\n-\t\tret = test_ring_enqueue(rp, obj, esize[i], 2,\n+\t\tret = test_ring_enqueue(rp, cur_src, esize[i], 2,\n \t\t\t\tTEST_RING_THREAD_DEF | TEST_RING_ELEM_BULK);\n \t\tif (ret != 2) {\n \t\t\tprintf(\"%s: rte_ring_enqueue_bulk fails\\n\", __func__);\n \t\t\tgoto fail_test;\n \t\t}\n+\t\tcur_src = test_ring_inc_ptr(cur_src, esize[i], 2);\n \n-\t\tret = test_ring_dequeue(rp, obj, esize[i], 2,\n+\t\tret = test_ring_dequeue(rp, cur_dst, esize[i], 2,\n \t\t\t\tTEST_RING_THREAD_DEF | TEST_RING_ELEM_BULK);\n \t\tif (ret != 2) {\n \t\t\tprintf(\"%s: rte_ring_dequeue_bulk fails\\n\", __func__);\n \t\t\tgoto fail_test;\n \t\t}\n+\t\tcur_dst = test_ring_inc_ptr(cur_dst, esize[i], 2);\n+\n+\t\t/* check data */\n+\t\tif (memcmp(src, dst, cur_dst - dst)) {\n+\t\t\trte_hexdump(stdout, \"src\", src, cur_src - src);\n+\t\t\trte_hexdump(stdout, \"dst\", dst, cur_dst - dst);\n+\t\t\tprintf(\"data after dequeue is not the same\\n\");\n+\t\t\tgoto fail_test;\n+\t\t}\n \n \t\trte_ring_free(rp);\n-\t\trte_free(obj);\n+\t\trte_free(src);\n+\t\trte_free(dst);\n \t\trp = NULL;\n-\t\tobj = NULL;\n+\t\tsrc = NULL;\n+\t\tdst = NULL;\n \t}\n \n \treturn 0;\n \n fail_test:\n \trte_ring_free(rp);\n-\tif (obj != NULL)\n-\t\trte_free(obj);\n-\n+\trte_free(src);\n+\trte_free(dst);\n \treturn -1;\n }\n \n@@ -889,8 +930,8 @@ static int\n test_ring_with_exact_size(void)\n {\n \tstruct rte_ring *std_r = NULL, *exact_sz_r = NULL;\n-\tvoid *obj_orig;\n-\tvoid *obj;\n+\tvoid **src_orig = NULL, **dst_orig = NULL;\n+\tvoid **src = NULL, **cur_src = NULL, **dst = NULL, **cur_dst = NULL;\n \tconst unsigned int ring_sz = 16;\n \tunsigned int i, j;\n \tint ret = -1;\n@@ -900,14 +941,6 @@ test_ring_with_exact_size(void)\n \t\t\t\tTEST_RING_IGNORE_API_TYPE,\n \t\t\t\tesize[i]);\n \n-\t\t/* alloc object pointers. Allocate one extra object\n-\t\t * and create an unaligned address.\n-\t\t */\n-\t\tobj_orig = test_ring_calloc(17, esize[i]);\n-\t\tif (obj_orig == NULL)\n-\t\t\tgoto test_fail;\n-\t\tobj = ((char *)obj_orig) + 1;\n-\n \t\tstd_r = test_ring_create(\"std\", esize[i], ring_sz,\n \t\t\t\t\trte_socket_id(),\n \t\t\t\t\tRING_F_SP_ENQ | RING_F_SC_DEQ);\n@@ -925,6 +958,22 @@ test_ring_with_exact_size(void)\n \t\t\tgoto test_fail;\n \t\t}\n \n+\t\t/* alloc object pointers. Allocate one extra object\n+\t\t * and create an unaligned address.\n+\t\t */\n+\t\tsrc_orig = test_ring_calloc(17, esize[i]);\n+\t\tif (src_orig == NULL)\n+\t\t\tgoto test_fail;\n+\t\ttest_ring_mem_init(src_orig, 17, esize[i]);\n+\t\tsrc = (void **)((uintptr_t)src_orig + 1);\n+\t\tcur_src = src;\n+\n+\t\tdst_orig = test_ring_calloc(17, esize[i]);\n+\t\tif (dst_orig == NULL)\n+\t\t\tgoto test_fail;\n+\t\tdst = (void **)((uintptr_t)dst_orig + 1);\n+\t\tcur_dst = dst;\n+\n \t\t/*\n \t\t * Check that the exact size ring is bigger than the\n \t\t * standard ring\n@@ -941,33 +990,36 @@ test_ring_with_exact_size(void)\n \t\t * than the standard ring. (16 vs 15 elements)\n \t\t */\n \t\tfor (j = 0; j < ring_sz - 1; j++) {\n-\t\t\ttest_ring_enqueue(std_r, obj, esize[i], 1,\n+\t\t\ttest_ring_enqueue(std_r, cur_src, esize[i], 1,\n \t\t\t\tTEST_RING_THREAD_DEF | TEST_RING_ELEM_SINGLE);\n-\t\t\ttest_ring_enqueue(exact_sz_r, obj, esize[i], 1,\n+\t\t\ttest_ring_enqueue(exact_sz_r, cur_src, esize[i], 1,\n \t\t\t\tTEST_RING_THREAD_DEF | TEST_RING_ELEM_SINGLE);\n+\t\t\tcur_src = test_ring_inc_ptr(cur_src, esize[i], 1);\n \t\t}\n-\t\tret = test_ring_enqueue(std_r, obj, esize[i], 1,\n+\t\tret = test_ring_enqueue(std_r, cur_src, esize[i], 1,\n \t\t\t\tTEST_RING_THREAD_DEF | TEST_RING_ELEM_SINGLE);\n \t\tif (ret != -ENOBUFS) {\n \t\t\tprintf(\"%s: error, unexpected successful enqueue\\n\",\n \t\t\t\t__func__);\n \t\t\tgoto test_fail;\n \t\t}\n-\t\tret = test_ring_enqueue(exact_sz_r, obj, esize[i], 1,\n+\t\tret = test_ring_enqueue(exact_sz_r, cur_src, esize[i], 1,\n \t\t\t\tTEST_RING_THREAD_DEF | TEST_RING_ELEM_SINGLE);\n \t\tif (ret == -ENOBUFS) {\n \t\t\tprintf(\"%s: error, enqueue failed\\n\", __func__);\n \t\t\tgoto test_fail;\n \t\t}\n+\t\tcur_src = test_ring_inc_ptr(cur_src, esize[i], 1);\n \n \t\t/* check that dequeue returns the expected number of elements */\n-\t\tret = test_ring_dequeue(exact_sz_r, obj, esize[i], ring_sz,\n+\t\tret = test_ring_dequeue(exact_sz_r, cur_dst, esize[i], ring_sz,\n \t\t\t\tTEST_RING_THREAD_DEF | TEST_RING_ELEM_BURST);\n \t\tif (ret != (int)ring_sz) {\n \t\t\tprintf(\"%s: error, failed to dequeue expected nb of elements\\n\",\n \t\t\t\t__func__);\n \t\t\tgoto test_fail;\n \t\t}\n+\t\tcur_dst = test_ring_inc_ptr(cur_dst, esize[i], ring_sz);\n \n \t\t/* check that the capacity function returns expected value */\n \t\tif (rte_ring_get_capacity(exact_sz_r) != ring_sz) {\n@@ -976,10 +1028,20 @@ test_ring_with_exact_size(void)\n \t\t\tgoto test_fail;\n \t\t}\n \n-\t\trte_free(obj_orig);\n+\t\t/* check data */\n+\t\tif (memcmp(src, dst, cur_dst - dst)) {\n+\t\t\trte_hexdump(stdout, \"src\", src, cur_src - src);\n+\t\t\trte_hexdump(stdout, \"dst\", dst, cur_dst - dst);\n+\t\t\tprintf(\"data after dequeue is not the same\\n\");\n+\t\t\tgoto test_fail;\n+\t\t}\n+\n+\t\trte_free(src_orig);\n+\t\trte_free(dst_orig);\n \t\trte_ring_free(std_r);\n \t\trte_ring_free(exact_sz_r);\n-\t\tobj_orig = NULL;\n+\t\tsrc_orig = NULL;\n+\t\tdst_orig = NULL;\n \t\tstd_r = NULL;\n \t\texact_sz_r = NULL;\n \t}\n@@ -987,7 +1049,8 @@ test_ring_with_exact_size(void)\n \treturn 0;\n \n test_fail:\n-\trte_free(obj_orig);\n+\trte_free(src_orig);\n+\trte_free(dst_orig);\n \trte_ring_free(std_r);\n \trte_ring_free(exact_sz_r);\n \treturn -1;\n",
    "prefixes": [
        "v3",
        "1/6"
    ]
}