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 897CBA00C3; Tue, 14 Dec 2021 15:13:23 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8DAF441161; Tue, 14 Dec 2021 15:12:57 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id BBAE241160 for ; Tue, 14 Dec 2021 15:12:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1639491175; x=1671027175; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=AjG5/zvos2AGIL5tqXhozcqeUzARK5umEsMt7TorXVw=; b=GbKCi/X9iFaHI/KGGAhJfLJK8QwSWLcMXINZfJ0oSkZbyiAS/hxzk9Ph LYGs9mz2j6vAb0tC7tHLyTEcCG+wGmHNfzOZw6pgolicvpKFG6gpgs+95 iYbci/6WufbPm5yvs/4KXboG82DfVyrIw9Xjri7RGEiKdvwffDEp1kswF IwGx9Vs6YBsES9V6d6UdTVGUn0a128DmaFW/u/a+uDgsOimy5GNHJiknF FL6j43e//HvxXoSCTk2+1Aw5eTB2zuUriykPUrkxwBH9/brQ8rW37XUNx 39air66v/fIIO6CmXvvCo2uAhdZk2ca47DQiyPOGOgX3UEa5b4J0WHa0q w==; X-IronPort-AV: E=McAfee;i="6200,9189,10197"; a="302362322" X-IronPort-AV: E=Sophos;i="5.88,205,1635231600"; d="scan'208";a="302362322" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Dec 2021 06:12:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,205,1635231600"; d="scan'208";a="465104132" Received: from silpixa00401120.ir.intel.com ([10.55.129.95]) by orsmga006.jf.intel.com with ESMTP; 14 Dec 2021 06:12:51 -0800 From: Ronan Randles To: dev@dpdk.org Cc: harry.van.haaren@intel.com Subject: [PATCH 05/12] gen: add raw packet data API and tests Date: Tue, 14 Dec 2021 14:12:35 +0000 Message-Id: <20211214141242.3383831-6-ronan.randles@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211214141242.3383831-1-ronan.randles@intel.com> References: <20211214141242.3383831-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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Harry van Haaren This commit adds a new API to gen, allowing the caller to set raw packet data with a size. Tests are added to test the new API with randomized packet data. Signed-off-by: Harry van Haaren --- app/test/test_gen.c | 33 ++++++++++++++++++++++++ lib/gen/rte_gen.c | 62 +++++++++++++++++++++++++++++++++++++++++---- lib/gen/rte_gen.h | 9 +++++++ lib/gen/version.map | 1 + 4 files changed, 100 insertions(+), 5 deletions(-) diff --git a/app/test/test_gen.c b/app/test/test_gen.c index ceacd8c7c4..b60ceaef8a 100644 --- a/app/test/test_gen.c +++ b/app/test/test_gen.c @@ -5,6 +5,7 @@ #include #include #include +#include #include "test.h" @@ -75,6 +76,37 @@ test_gen_loop_rxtx(void) total_sent += nb_tx; } + rte_gen_destroy(gen); + return 0; +} + +static int +test_gen_packet_set_raw(void) +{ + struct rte_gen *gen = rte_gen_create(mp); + TEST_ASSERT_FAIL(gen, "Expected valid pointer after create()"); + + /* Set a raw packet payload, and ensure the next received packet has + * that packet data as contents and size. + */ + uint64_t pkt_data[8]; + uint32_t i; + for (i = 0; i < 8; i++) + pkt_data[i] = rte_rand(); + + int32_t err = rte_gen_packet_set_raw(gen, (void *)pkt_data, 64); + TEST_ASSERT_EQUAL(err, 0, "Expected set raw() to return success."); + + struct rte_mbuf *bufs[BURST_MAX]; + uint16_t nb_rx = rte_gen_rx_burst(gen, bufs, 1); + TEST_ASSERT_EQUAL(nb_rx, 1, "Expected rx packet burst."); + + void *mbuf_data = rte_pktmbuf_mtod(bufs[0], void *); + int32_t data_equal = memcmp(pkt_data, mbuf_data, 64) == 0; + TEST_ASSERT_EQUAL(data_equal, 1, + "Expected packet data equal to input data."); + + rte_pktmbuf_free(bufs[0]); rte_gen_destroy(gen); return 0; @@ -88,6 +120,7 @@ static struct unit_test_suite gen_suite = { TEST_CASE_ST(NULL, NULL, test_gen_create), TEST_CASE_ST(NULL, NULL, test_gen_basic_rxtx), TEST_CASE_ST(NULL, NULL, test_gen_loop_rxtx), + TEST_CASE_ST(NULL, NULL, test_gen_packet_set_raw), TEST_CASES_END() /**< NULL terminate unit test array */ } }; diff --git a/lib/gen/rte_gen.c b/lib/gen/rte_gen.c index f0ad57fa81..432be65f1a 100644 --- a/lib/gen/rte_gen.c +++ b/lib/gen/rte_gen.c @@ -6,13 +6,25 @@ #include #include +#include +#include + +RTE_LOG_REGISTER(gen_logtype, lib.gen, NOTICE); + +#define TGEN_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, gen_logtype, "%s(): " fmt, \ + __func__, ## args) #define GEN_MAX_BURST 32 +#define GEN_INIT_PKT_SIZE 64 /** Structure that represents a traffic generator. */ struct rte_gen { /* Mempool that buffers are retrieved from. */ struct rte_mempool *mp; + + /* Packet template to send. */ + struct rte_mbuf *base_pkt; }; /* Allocate and initialize a traffic generator instance. */ @@ -25,6 +37,15 @@ rte_gen_create(struct rte_mempool *mempool) gen->mp = mempool; + uint8_t data[GEN_INIT_PKT_SIZE]; + memset(data, 0, GEN_INIT_PKT_SIZE); + int32_t err = rte_gen_packet_set_raw(gen, data, GEN_INIT_PKT_SIZE); + if (err) { + TGEN_LOG(ERR, "Failed to set initial packet\n"); + rte_free(gen); + return NULL; + } + return gen; } @@ -32,9 +53,37 @@ rte_gen_create(struct rte_mempool *mempool) void rte_gen_destroy(struct rte_gen *gen) { + rte_pktmbuf_free(gen->base_pkt); rte_free(gen); } +int32_t +rte_gen_packet_set_raw(struct rte_gen *gen, + const uint8_t *raw_data, + uint32_t raw_data_size) +{ + + struct rte_mbuf *new_pkt = rte_pktmbuf_alloc(gen->mp); + if (!new_pkt) { + TGEN_LOG(ERR, "Failed to retireve mbuf for parser\n"); + return -ENOMEM; + } + + uint8_t *base_data = rte_pktmbuf_mtod(new_pkt, uint8_t *); + new_pkt->pkt_len = raw_data_size; + new_pkt->data_len = raw_data_size; + rte_memcpy(base_data, raw_data, raw_data_size); + + /* If old packet exists, free it. */ + struct rte_mbuf *old_pkt = gen->base_pkt; + gen->base_pkt = new_pkt; + + if (old_pkt) + rte_pktmbuf_free(old_pkt); + + return 0; +} + uint16_t rte_gen_rx_burst(struct rte_gen *gen, struct rte_mbuf **rx_pkts, @@ -45,17 +94,20 @@ rte_gen_rx_burst(struct rte_gen *gen, if (err) return 0; - const uint32_t pkt_len = 64; + if (!gen->base_pkt) + return 0; + + const uint32_t base_size = gen->base_pkt->pkt_len; + const uint8_t *base_data = rte_pktmbuf_mtod(gen->base_pkt, uint8_t *); uint32_t i; for (i = 0; i < nb_pkts; i++) { struct rte_mbuf *m = rx_pkts[i]; uint8_t *pkt_data = rte_pktmbuf_mtod(m, uint8_t *); - memset(pkt_data, 0, pkt_len); - - m->pkt_len = pkt_len; - m->data_len = pkt_len; + rte_memcpy(pkt_data, base_data, base_size); + m->pkt_len = base_size; + m->data_len = base_size; } return nb_pkts; diff --git a/lib/gen/rte_gen.h b/lib/gen/rte_gen.h index 09ee1e8872..c8d85a5b72 100644 --- a/lib/gen/rte_gen.h +++ b/lib/gen/rte_gen.h @@ -85,6 +85,15 @@ rte_gen_tx_burst(struct rte_gen *gen, uint64_t *pkt_latencies, const uint16_t nb_pkts); +/* Update the packet being sent to the provided raw data. + * @retval 0 Success. + * @retval -ENOMEM No memory available. + */ +int32_t +__rte_experimental +rte_gen_packet_set_raw(struct rte_gen *gen, + const uint8_t *raw_data, + uint32_t raw_data_size); #ifdef __cplusplus } diff --git a/lib/gen/version.map b/lib/gen/version.map index bdd25add6f..d75e0b4bac 100644 --- a/lib/gen/version.map +++ b/lib/gen/version.map @@ -5,4 +5,5 @@ EXPERIMENTAL { rte_gen_destroy; rte_gen_rx_burst; rte_gen_tx_burst; + rte_gen_packet_set_raw; }; -- 2.25.1