Patch Detail

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

{
    "id": 106166,
    "url": "http://patches.dpdk.org/api/patches/106166/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20220121103122.2926856-6-ronan.randles@intel.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": "<20220121103122.2926856-6-ronan.randles@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20220121103122.2926856-6-ronan.randles@intel.com",
    "date": "2022-01-21T10:31:12",
    "name": "[v2,05/15] gen: add raw packet data API and tests",
    "commit_ref": null,
    "pull_url": null,
    "state": "not-applicable",
    "archived": true,
    "hash": "bd9d581f88a69654584e8fa3a35d1f7b61efe7d2",
    "submitter": {
        "id": 2439,
        "url": "http://patches.dpdk.org/api/people/2439/?format=api",
        "name": "Ronan Randles",
        "email": "ronan.randles@intel.com"
    },
    "delegate": {
        "id": 1,
        "url": "http://patches.dpdk.org/api/users/1/?format=api",
        "username": "tmonjalo",
        "first_name": "Thomas",
        "last_name": "Monjalon",
        "email": "thomas@monjalon.net"
    },
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/20220121103122.2926856-6-ronan.randles@intel.com/mbox/",
    "series": [
        {
            "id": 21295,
            "url": "http://patches.dpdk.org/api/series/21295/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=21295",
            "date": "2022-01-21T10:31:07",
            "name": "add packet generator library and example app",
            "version": 2,
            "mbox": "http://patches.dpdk.org/series/21295/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/106166/comments/",
    "check": "warning",
    "checks": "http://patches.dpdk.org/api/patches/106166/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 mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id F05A6A034E;\n\tFri, 21 Jan 2022 11:32:02 +0100 (CET)",
            "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id C311642764;\n\tFri, 21 Jan 2022 11:31:39 +0100 (CET)",
            "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n by mails.dpdk.org (Postfix) with ESMTP id 2DB8C42757\n for <dev@dpdk.org>; Fri, 21 Jan 2022 11:31:37 +0100 (CET)",
            "from orsmga008.jf.intel.com ([10.7.209.65])\n by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 21 Jan 2022 02:31:36 -0800",
            "from silpixa00401120.ir.intel.com ([10.55.128.255])\n by orsmga008.jf.intel.com with ESMTP; 21 Jan 2022 02:31:35 -0800"
        ],
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1642761097; x=1674297097;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=zncenptnen9fHq6YHxv55gRfhOol/tz/LC/EFi83TiM=;\n b=jaya3XRgG/tIOL5cBaY1AGCG7aG4KKCIRySezkR8JUBba2EHwKIFvgLm\n 9Vw+AljEd4O0fHe3NDhyg7eLGfzbOnFHvePzV6A3NqXX4OaYr7gGCYvqz\n 2ajVJ7jv2VyCAdoR9b3I8rGcctaq6idQgogXDZpaHPacCVOcJ8Iq3TVOs\n OByD8BRY9jWnWKLYyEtruX9Y+4+XDFV14b8tJ2QucKS9avhW1PcTYtDdx\n gWmWaDaofvEB3EfPJYoTX669Sw9yttOro/YPz/BN9U8lxbfjniu5ZFmH4\n MqzSFaFX34SsFxmCin6c+IyClSbHfJIunxYiioqgg7J5PfAGRAagZc3ZM A==;",
        "X-IronPort-AV": [
            "E=McAfee;i=\"6200,9189,10233\"; a=\"270045095\"",
            "E=Sophos;i=\"5.88,304,1635231600\"; d=\"scan'208\";a=\"270045095\"",
            "E=Sophos;i=\"5.88,304,1635231600\"; d=\"scan'208\";a=\"533222744\""
        ],
        "X-ExtLoop1": "1",
        "From": "Ronan Randles <ronan.randles@intel.com>",
        "To": "dev@dpdk.org",
        "Cc": "Harry van Haaren <harry.van.haaren@intel.com>",
        "Subject": "[PATCH v2 05/15] gen: add raw packet data API and tests",
        "Date": "Fri, 21 Jan 2022 10:31:12 +0000",
        "Message-Id": "<20220121103122.2926856-6-ronan.randles@intel.com>",
        "X-Mailer": "git-send-email 2.25.1",
        "In-Reply-To": "<20220121103122.2926856-1-ronan.randles@intel.com>",
        "References": "<20211214141242.3383831-1-ronan.randles@intel.com>\n <20220121103122.2926856-1-ronan.randles@intel.com>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.29",
        "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"
    },
    "content": "From: Harry van Haaren <harry.van.haaren@intel.com>\n\nThis commit adds a new API to gen, allowing the caller to set\nraw packet data with a size. Tests are added to test the new\nAPI with randomized packet data.\n\nSigned-off-by: Harry van Haaren <harry.van.haaren@intel.com>\n---\n app/test/test_gen.c | 33 ++++++++++++++++++++++++\n lib/gen/rte_gen.c   | 62 +++++++++++++++++++++++++++++++++++++++++----\n lib/gen/rte_gen.h   |  9 +++++++\n lib/gen/version.map |  1 +\n 4 files changed, 100 insertions(+), 5 deletions(-)",
    "diff": "diff --git a/app/test/test_gen.c b/app/test/test_gen.c\nindex ceacd8c7c4..b60ceaef8a 100644\n--- a/app/test/test_gen.c\n+++ b/app/test/test_gen.c\n@@ -5,6 +5,7 @@\n #include <rte_common.h>\n #include <rte_gen.h>\n #include <rte_mbuf.h>\n+#include <rte_random.h>\n \n #include \"test.h\"\n \n@@ -75,6 +76,37 @@ test_gen_loop_rxtx(void)\n \n \t\ttotal_sent += nb_tx;\n \t}\n+\trte_gen_destroy(gen);\n+\treturn 0;\n+}\n+\n+static int\n+test_gen_packet_set_raw(void)\n+{\n+\tstruct rte_gen *gen = rte_gen_create(mp);\n+\tTEST_ASSERT_FAIL(gen, \"Expected valid pointer after create()\");\n+\n+\t/* Set a raw packet payload, and ensure the next received packet has\n+\t * that packet data as contents and size.\n+\t */\n+\tuint64_t pkt_data[8];\n+\tuint32_t i;\n+\tfor (i = 0; i < 8; i++)\n+\t\tpkt_data[i] = rte_rand();\n+\n+\tint32_t err = rte_gen_packet_set_raw(gen, (void *)pkt_data, 64);\n+\tTEST_ASSERT_EQUAL(err, 0, \"Expected set raw() to return success.\");\n+\n+\tstruct rte_mbuf *bufs[BURST_MAX];\n+\tuint16_t nb_rx = rte_gen_rx_burst(gen, bufs, 1);\n+\tTEST_ASSERT_EQUAL(nb_rx, 1, \"Expected rx packet burst.\");\n+\n+\tvoid *mbuf_data = rte_pktmbuf_mtod(bufs[0], void *);\n+\tint32_t data_equal = memcmp(pkt_data, mbuf_data, 64) == 0;\n+\tTEST_ASSERT_EQUAL(data_equal, 1,\n+\t\t\"Expected packet data equal to input data.\");\n+\n+\trte_pktmbuf_free(bufs[0]);\n \n \trte_gen_destroy(gen);\n \treturn 0;\n@@ -88,6 +120,7 @@ static struct unit_test_suite gen_suite  = {\n \t\tTEST_CASE_ST(NULL, NULL, test_gen_create),\n \t\tTEST_CASE_ST(NULL, NULL, test_gen_basic_rxtx),\n \t\tTEST_CASE_ST(NULL, NULL, test_gen_loop_rxtx),\n+\t\tTEST_CASE_ST(NULL, NULL, test_gen_packet_set_raw),\n \t\tTEST_CASES_END() /**< NULL terminate unit test array */\n \t}\n };\ndiff --git a/lib/gen/rte_gen.c b/lib/gen/rte_gen.c\nindex f0ad57fa81..8a54c4bcdb 100644\n--- a/lib/gen/rte_gen.c\n+++ b/lib/gen/rte_gen.c\n@@ -6,13 +6,25 @@\n \n #include <rte_mbuf.h>\n #include <rte_malloc.h>\n+#include <rte_hexdump.h>\n+#include <rte_log.h>\n+\n+RTE_LOG_REGISTER(gen_logtype, lib.gen, NOTICE);\n+\n+#define GEN_LOG(level, fmt, args...)\t\t\t\t\\\n+\trte_log(RTE_LOG_ ## level, gen_logtype, \"%s(): \" fmt,\t\\\n+\t\t__func__, ## args)\n \n #define GEN_MAX_BURST 32\n+#define GEN_INIT_PKT_SIZE 64\n \n /** Structure that represents a traffic generator. */\n struct rte_gen {\n \t/* Mempool that buffers are retrieved from. */\n \tstruct rte_mempool *mp;\n+\n+\t/* Packet template to send. */\n+\tstruct rte_mbuf *base_pkt;\n };\n \n /* Allocate and initialize a traffic generator instance. */\n@@ -25,6 +37,15 @@ rte_gen_create(struct rte_mempool *mempool)\n \n \tgen->mp = mempool;\n \n+\tuint8_t data[GEN_INIT_PKT_SIZE];\n+\tmemset(data, 0, GEN_INIT_PKT_SIZE);\n+\tint32_t err = rte_gen_packet_set_raw(gen, data, GEN_INIT_PKT_SIZE);\n+\tif (err) {\n+\t\tGEN_LOG(ERR, \"Failed to set initial packet\\n\");\n+\t\trte_free(gen);\n+\t\treturn NULL;\n+\t}\n+\n \treturn gen;\n }\n \n@@ -32,9 +53,37 @@ rte_gen_create(struct rte_mempool *mempool)\n void\n rte_gen_destroy(struct rte_gen *gen)\n {\n+\trte_pktmbuf_free(gen->base_pkt);\n \trte_free(gen);\n }\n \n+int32_t\n+rte_gen_packet_set_raw(struct rte_gen *gen,\n+\t\t       const uint8_t *raw_data,\n+\t\t       uint32_t raw_data_size)\n+{\n+\n+\tstruct rte_mbuf *new_pkt = rte_pktmbuf_alloc(gen->mp);\n+\tif (!new_pkt) {\n+\t\tGEN_LOG(ERR, \"Failed to retireve mbuf for parser\\n\");\n+\t\treturn -ENOMEM;\n+\t}\n+\n+\tuint8_t *base_data = rte_pktmbuf_mtod(new_pkt, uint8_t *);\n+\tnew_pkt->pkt_len = raw_data_size;\n+\tnew_pkt->data_len = raw_data_size;\n+\trte_memcpy(base_data, raw_data, raw_data_size);\n+\n+\t/* If old packet exists, free it. */\n+\tstruct rte_mbuf *old_pkt = gen->base_pkt;\n+\tgen->base_pkt = new_pkt;\n+\n+\tif (old_pkt)\n+\t\trte_pktmbuf_free(old_pkt);\n+\n+\treturn 0;\n+}\n+\n uint16_t\n rte_gen_rx_burst(struct rte_gen *gen,\n \t\t struct rte_mbuf **rx_pkts,\n@@ -45,17 +94,20 @@ rte_gen_rx_burst(struct rte_gen *gen,\n \tif (err)\n \t\treturn 0;\n \n-\tconst uint32_t pkt_len = 64;\n+\tif (!gen->base_pkt)\n+\t\treturn 0;\n+\n+\tconst uint32_t base_size = gen->base_pkt->pkt_len;\n+\tconst uint8_t *base_data = rte_pktmbuf_mtod(gen->base_pkt, uint8_t *);\n \n \tuint32_t i;\n \tfor (i = 0; i < nb_pkts; i++) {\n \t\tstruct rte_mbuf *m = rx_pkts[i];\n \t\tuint8_t *pkt_data = rte_pktmbuf_mtod(m, uint8_t *);\n \n-\t\tmemset(pkt_data, 0, pkt_len);\n-\n-\t\tm->pkt_len  = pkt_len;\n-\t\tm->data_len = pkt_len;\n+\t\trte_memcpy(pkt_data, base_data, base_size);\n+\t\tm->pkt_len = base_size;\n+\t\tm->data_len = base_size;\n \t}\n \n \treturn nb_pkts;\ndiff --git a/lib/gen/rte_gen.h b/lib/gen/rte_gen.h\nindex 09ee1e8872..9119331673 100644\n--- a/lib/gen/rte_gen.h\n+++ b/lib/gen/rte_gen.h\n@@ -85,6 +85,15 @@ rte_gen_tx_burst(struct rte_gen *gen,\n \t\t uint64_t *pkt_latencies,\n \t\t const uint16_t nb_pkts);\n \n+/* Update the packet being sent to the provided raw data.\n+ * @retval 0 Success.\n+ * @retval -ENOMEM No memory available.\n+ */\n+__rte_experimental\n+int32_t\n+rte_gen_packet_set_raw(struct rte_gen *gen,\n+\t\t       const uint8_t *raw_data,\n+\t\t       uint32_t raw_data_size);\n \n #ifdef __cplusplus\n }\ndiff --git a/lib/gen/version.map b/lib/gen/version.map\nindex bdd25add6f..d75e0b4bac 100644\n--- a/lib/gen/version.map\n+++ b/lib/gen/version.map\n@@ -5,4 +5,5 @@ EXPERIMENTAL {\n \trte_gen_destroy;\n \trte_gen_rx_burst;\n \trte_gen_tx_burst;\n+\trte_gen_packet_set_raw;\n };\n",
    "prefixes": [
        "v2",
        "05/15"
    ]
}