From patchwork Fri Jul 28 10:59:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bogdan Pricope X-Patchwork-Id: 108877 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp302038obm; Fri, 28 Jul 2017 04:00:28 -0700 (PDT) X-Received: by 10.233.239.11 with SMTP id d11mr8933044qkg.266.1501239628378; Fri, 28 Jul 2017 04:00:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501239628; cv=none; d=google.com; s=arc-20160816; b=pfj06xpScfK1n+oAfY04BAHVQYe+RXZN/GU78IBcO5AbwMo7R8PTqBEK4Ncq0gvbFG EQb32Dze5S1HhU8utThxcLqYF3Z870upYpAcFEu4OWdF3fXXRv/DU6kL1sSmK4Xymvnm +k9jrbRxV7QM4Wue6qVf5rGpPuBinfD0SxeEPQVmYauYeuPmqKM+SkhxlZZlH3kWyZR4 0Kc3O/acJo0VsyeK3kw/437xrB4oAndjfHH+vL+h6KY+Wet0M8uMg7yCqWVG+6wOWZaw w8tnTFUtKwwj4dc3PwT8vUPEyy8TWp3VGhZfiS+7AlTE6xhAN81KxXD3RD6jZ2JGcCRk rcog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=3TWunC41njOA5vdainilR/IbWZl3M5SJ4a1x/sAipxk=; b=yVckkkBMqZwM+XqBjta8C7yhDU/48YzWui9i6N7ND52w1PlpKo7VjqBlLPFhSmjGbw i9GIMsfL1VhaYk+ejEVddxI6AMkjTJLAwdvKj3iIjPLsYwJhzYi1BOWZeTjlZXbxga9Q IRoDqi925IbVWQAd4+pssnf6aexkKRjEaPu8XMVBgxV/+VmetieIsHws0iEN9GfD99/Z nsMesVH+5CyopyKWooO+BZaRg7UuOOjFeE5DD6llxhNi6t7UueaTvc1nHb7kaMzr6tDo /6JcP1LXHN5ecJBTkGof1R3CN+bT9W16fiiMYtCeTibioubKGs7/CSYO+kOc26TUX8fJ br6A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id j65si2773696qkf.384.2017.07.28.04.00.25; Fri, 28 Jul 2017 04:00:28 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 5C60B65C64; Fri, 28 Jul 2017 11:00:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 74FE465C53; Fri, 28 Jul 2017 11:00:17 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 1187765C5D; Fri, 28 Jul 2017 11:00:11 +0000 (UTC) Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com [74.125.82.53]) by lists.linaro.org (Postfix) with ESMTPS id 5C40165C52 for ; Fri, 28 Jul 2017 10:59:53 +0000 (UTC) Received: by mail-wm0-f53.google.com with SMTP id e199so16939676wmd.0 for ; Fri, 28 Jul 2017 03:59:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3TWunC41njOA5vdainilR/IbWZl3M5SJ4a1x/sAipxk=; b=bEIFqRRD/qPj96XXMb8BTshAbdfQOKlPnsZdDtrcjo2ZrnTl1sMGpa4jWHFgOYEa2z p5Enc6O4xUoM46dOc9Ja8KmULM0sOFoRpTvmRmq57kEKBBBkAA/Gw/yaQbuKlmjLMepY bdVdROlGlq8RbVdtk/yApsDsIG+QyJ5PDIo1cF0cK7l3eAw8UVhRkzSFuw5VLVx4N6Pz cEr9pG4aehjHkces0wM+PzoJVpWgAIFjAhYJo0T0tCVZ3jWUlqhy7LJoMiBEKrF5TIWx 5GhVGZa1eCeYci0tFMsXQHD/DQy8rM9awGKhrlCTXwo8FaaODhYyFCA69WMj3dPbc6w3 wjyw== X-Gm-Message-State: AIVw112sQC2nxklARHqaSqCADejkG8o/o6D7mkqVwLP4u8vxPPMyOUQX fRAVOi9NQrlkVMbSPW/80rEj X-Received: by 10.28.97.134 with SMTP id v128mr5468710wmb.83.1501239592054; Fri, 28 Jul 2017 03:59:52 -0700 (PDT) Received: from netbricks-team.enea.se ([193.202.22.66]) by smtp.gmail.com with ESMTPSA id r30sm21025654wrc.95.2017.07.28.03.59.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 28 Jul 2017 03:59:51 -0700 (PDT) From: Bogdan Pricope To: lng-odp@lists.linaro.org Date: Fri, 28 Jul 2017 13:59:38 +0300 Message-Id: <1501239578-5985-2-git-send-email-bogdan.pricope@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1501239578-5985-1-git-send-email-bogdan.pricope@linaro.org> References: <1501239578-5985-1-git-send-email-bogdan.pricope@linaro.org> Subject: [lng-odp] [PATCH] example: generator : use packet reference API to generate udp and icmp traffic X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Signed-off-by: Bogdan Pricope --- example/generator/odp_generator.c | 176 +++++++++++++++++++++++--------------- 1 file changed, 107 insertions(+), 69 deletions(-) -- 1.9.1 diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 9336cec..ef37328 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -136,6 +136,7 @@ static void millisleep(uint32_t ms, uint64_t ticks = odp_timer_ns_to_tick(tp, 1000000ULL * ms); odp_event_t ev = odp_timeout_to_event(tmo); int rc = odp_timer_set_rel(tim, ticks, &ev); + if (rc != ODP_TIMER_SUCCESS) EXAMPLE_ABORT("odp_timer_set_rel() failed\n"); /* Spin waiting for timeout event */ @@ -186,12 +187,76 @@ static int scan_ip(char *buf, unsigned int *paddr) } /** + * Setup array of reference packets + * + * @param pool Packet pool + * @param pkt_ref_array Packet array + * @param pkt_ref_array_size Packet array size + * @param setup_ref Packet setup function + * @return 0 success, -1 failed +*/ +static int setup_pkt_ref_array(odp_pool_t pool, + odp_packet_t *pkt_ref_array, + int pkt_ref_array_size, + odp_packet_t (*setup_ref)(odp_pool_t)) +{ + int i; + + for (i = 0; i < pkt_ref_array_size; i++) { + pkt_ref_array[i] = (*setup_ref)(pool); + if (pkt_ref_array[i] == ODP_PACKET_INVALID) + break; + } + + if (i < pkt_ref_array_size) { + odp_packet_free_multi(pkt_ref_array, i); + return -1; + } + return 0; +} + +/** + * Setup array of packets + * + * @param pkt_ref_array Reference packet array + * @param pkt_array Packet array + * @param pkt_array_size Packet array size + * @param setup_pkt Packet setup function + * @return 0 success, -1 failed +*/ +static int setup_pkt_array(odp_packet_t *pkt_ref_array, + odp_packet_t *pkt_array, + int pkt_array_size, + int (*setup_pkt)(odp_packet_t)) +{ + int i; + + for (i = 0; i < pkt_array_size; i++) { + if ((*setup_pkt)(pkt_ref_array[i])) + break; + + pkt_array[i] = odp_packet_ref_static(pkt_ref_array[i]); + if (pkt_array[i] == ODP_PACKET_INVALID) + break; + } + if (i < pkt_array_size) { + if (i) + odp_packet_free_multi(pkt_array, i - 1); + + return -1; + } + return 0; +} + +/** * set up an udp packet reference * * @param pool Buffer pool to create packet in * - * @return Handle of created packet + * + * @retval Handle of created packet * @retval ODP_PACKET_INVALID Packet could not be created + * */ static odp_packet_t setup_udp_pkt_ref(odp_pool_t pool) { @@ -246,37 +311,27 @@ static odp_packet_t setup_udp_pkt_ref(odp_pool_t pool) /** * set up an udp packet * - * @param pool Buffer pool to create packet in - * @param pkt_ref Reference UDP packet + * @param pkt Reference UDP packet * - * @return Handle of created packet - * @retval ODP_PACKET_INVALID Packet could not be created + * @return Success/Failed + * @retval 0 on success, -1 on fail */ -static odp_packet_t pack_udp_pkt(odp_pool_t pool, odp_packet_t pkt_ref) +static int setup_udp_pkt(odp_packet_t pkt) { - odp_packet_t pkt; char *buf; odph_ipv4hdr_t *ip; unsigned short seq; - pkt = odp_packet_alloc(pool, args->appl.payload + ODPH_UDPHDR_LEN + - ODPH_IPV4HDR_LEN + ODPH_ETHHDR_LEN); - - if (pkt == ODP_PACKET_INVALID) - return pkt; - buf = (char *)odp_packet_data(pkt); - odp_memcpy(buf, odp_packet_data(pkt_ref), - args->appl.payload + ODPH_UDPHDR_LEN + - ODPH_IPV4HDR_LEN + ODPH_ETHHDR_LEN); /*Update IP ID and checksum*/ ip = (odph_ipv4hdr_t *)(buf + ODPH_ETHHDR_LEN); seq = odp_atomic_fetch_add_u64(&counters.seq, 1) % 0xFFFF; ip->id = odp_cpu_to_be_16(seq); + ip->chksum = 0; ip->chksum = odph_chksum(ip, ODPH_IPV4HDR_LEN); - return pkt; + return 0; } /** @@ -337,15 +392,13 @@ static odp_packet_t setup_icmp_pkt_ref(odp_pool_t pool) /** * Set up an icmp packet * - * @param pool Buffer pool to create packet in - * @param pkt_ref Reference ICMP packet + * @param pkt Reference ICMP packet * - * @return Handle of created packet - * @retval ODP_PACKET_INVALID Packet could not be created + * @return Success/Failed + * @retval 0 on success, -1 on fail */ -static odp_packet_t pack_icmp_pkt(odp_pool_t pool, odp_packet_t pkt_ref) +static int setup_icmp_pkt(odp_packet_t pkt) { - odp_packet_t pkt; char *buf; odph_ipv4hdr_t *ip; odph_icmphdr_t *icmp; @@ -353,21 +406,13 @@ static odp_packet_t pack_icmp_pkt(odp_pool_t pool, odp_packet_t pkt_ref) uint8_t *tval_d; unsigned short seq; - pkt = odp_packet_alloc(pool, args->appl.payload + ODPH_ICMPHDR_LEN + - ODPH_IPV4HDR_LEN + ODPH_ETHHDR_LEN); - - if (pkt == ODP_PACKET_INVALID) - return pkt; - buf = (char *)odp_packet_data(pkt); - odp_memcpy(buf, odp_packet_data(pkt_ref), - args->appl.payload + ODPH_ICMPHDR_LEN + - ODPH_IPV4HDR_LEN + ODPH_ETHHDR_LEN); /* ip */ ip = (odph_ipv4hdr_t *)(buf + ODPH_ETHHDR_LEN); seq = odp_atomic_fetch_add_u64(&counters.seq, 1) % 0xffff; ip->id = odp_cpu_to_be_16(seq); + ip->chksum = 0; ip->chksum = odph_chksum(ip, ODPH_IPV4HDR_LEN); /* icmp */ @@ -382,7 +427,7 @@ static odp_packet_t pack_icmp_pkt(odp_pool_t pool, odp_packet_t pkt_ref) icmp->chksum = 0; icmp->chksum = odph_chksum(icmp, args->appl.payload + ODPH_ICMPHDR_LEN); - return pkt; + return 0; } /** @@ -479,33 +524,43 @@ static int create_pktio(const char *dev, odp_pool_t pool, static int gen_send_thread(void *arg) { int thr; - int ret, i; + int ret = 0; thread_args_t *thr_args; odp_pktout_queue_t pktout; + odp_packet_t pkt_ref_array[MAX_UDP_TX_BURST]; odp_packet_t pkt_array[MAX_UDP_TX_BURST]; int pkt_array_size; int burst_start, burst_size; - odp_packet_t pkt_ref = ODP_PACKET_INVALID; + odp_packet_t (*setup_pkt_ref)(odp_pool_t) = NULL; + int (*setup_pkt)(odp_packet_t) = NULL; thr = odp_thread_id(); thr_args = arg; pktout = thr_args->pktout; + if (args->appl.mode != APPL_MODE_UDP && + args->appl.mode != APPL_MODE_PING) { + EXAMPLE_ERR(" [%02i] Error: invalid processing mode %d\n", + thr, args->appl.mode); + return -1; + } + + /* Create reference packets*/ if (args->appl.mode == APPL_MODE_UDP) { - pkt_ref = setup_udp_pkt_ref(thr_args->pool); pkt_array_size = args->appl.udp_tx_burst; + setup_pkt_ref = setup_udp_pkt_ref; + setup_pkt = setup_udp_pkt; } else if (args->appl.mode == APPL_MODE_PING) { - pkt_ref = setup_icmp_pkt_ref(thr_args->pool); pkt_array_size = 1; - } else { - EXAMPLE_ERR(" [%02i] Error: invalid processing mode %d\n", - thr, args->appl.mode); - return -1; + setup_pkt_ref = setup_icmp_pkt_ref; + setup_pkt = setup_icmp_pkt; } - if (pkt_ref == ODP_PACKET_INVALID) { - EXAMPLE_ERR(" [%2i] Error: reference packet creation failed\n", - thr); + + if (setup_pkt_ref_array(thr_args->pool, pkt_ref_array, + pkt_array_size, setup_pkt_ref)) { + EXAMPLE_ERR("[%02i] Error: failed to create" + " reference packets\n", thr); return -1; } @@ -519,30 +574,15 @@ static int gen_send_thread(void *arg) (unsigned int)args->appl.number) break; - if (args->appl.mode == APPL_MODE_UDP) { - for (i = 0; i < pkt_array_size; i++) { - pkt_array[i] = pack_udp_pkt(thr_args->pool, - pkt_ref); - if (!odp_packet_is_valid(pkt_array[i])) - break; - } - if (i != pkt_array_size) { - EXAMPLE_ERR(" [%2i] alloc_multi failed\n", - thr); - odp_packet_free_multi(pkt_array, i); - break; - } - } else if (args->appl.mode == APPL_MODE_PING) { - pkt_array[0] = pack_icmp_pkt(thr_args->pool, pkt_ref); - if (!odp_packet_is_valid(pkt_array[0])) { - EXAMPLE_ERR(" [%2i] alloc_single failed\n", - thr); - break; - } - } else { + /* Setup TX burst*/ + if (setup_pkt_array(pkt_ref_array, pkt_array, + pkt_array_size, setup_pkt)) { + EXAMPLE_ERR("[%02i] Error: failed to setup packets\n", + thr); break; } + /* Send TX burst*/ for (burst_start = 0, burst_size = pkt_array_size;;) { ret = odp_pktout_send(pktout, &pkt_array[burst_start], burst_size); @@ -572,7 +612,6 @@ static int gen_send_thread(void *arg) thr_args->tim, thr_args->tq, thr_args->tmo_ev); - } } @@ -590,7 +629,8 @@ static int gen_send_thread(void *arg) args->appl.timeout--; } } - odp_packet_free(pkt_ref); + + odp_packet_free_multi(pkt_ref_array, pkt_array_size); return 0; } @@ -1084,7 +1124,6 @@ int main(int argc, char *argv[]) odph_odpthreads_create(&thread_tbl[i], &thd_mask, &thr_params); cpu = odp_cpumask_next(&cpumask, cpu); - } } @@ -1132,7 +1171,6 @@ int main(int argc, char *argv[]) return 0; } - /** * Parse and store the command line arguments *