From patchwork Wed May 31 14:41:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bogdan Pricope X-Patchwork-Id: 100795 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp357412qge; Wed, 31 May 2017 07:44:17 -0700 (PDT) X-Received: by 10.55.66.80 with SMTP id p77mr26236459qka.225.1496241857079; Wed, 31 May 2017 07:44:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496241857; cv=none; d=google.com; s=arc-20160816; b=F5aJd0FtJBgeOvKfrhEFyWhYEYQ+QlicpUYnmctEoRXsj4rQUC8ri2ERpr8Gr5PGtF IvQGBLYF16LGsjF3f+mxUwndpywaTYXoAJAHDywDd1/IWCgEzJx94LSaYvxSaZVjiLEj +6J5f2MAK7Z0+CkEvGqL9Sd71GxtQEoPEVRxtl7qFegOdUAOv+yHBIRMPzEqpQ7zSU4u bpVdLdGJlyEzUcrfAGo5eliT/mJdGxHgcTETCUfQhuDzdCNnf2MDbxNeIoBpDIUbqCfN ocqxizcl1n1QrLnakvl+SABxAZFSj+sWFSUHoxJpRV57ukr5+9d0d/rgcb9bMQZ8DjFw sl7w== 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=hVxLDku1a8zrKLR2vIKoAx4l+1VfaytVbvwAWNDtx6U=; b=h1yP/Frm6ypigrCXh5BSOu3eXORhKhTVWx8yq5yaVQtQlv6t2f/5NB1UPom6rzjBou GnaictjFQDk5jYyF07DbEq9hfAPcH2vDapB5kKQ6gYJU0hlnqaiRvjdNFr4xffrXXDTZ NlDa8O442TpMGaz5d4Z+TKOut2yChjjNh13u+fTiBXz19JR1d+RXN45+0FVpqAm1luU2 5CVVRWcWDV6o3vUQ1VttlD59OhLaG5fL0uQyOXpGmR8zj0LH2CUcX4Vp8J5Gmi/ABsAb ImhKM7JLB45wmZdSsTynMQw5N9xxeOSXfm2h0kHGzYOL9ihZqmAEiffJflYWpixzdw2p hxcw== 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 p65si16192819qkd.290.2017.05.31.07.44.16; Wed, 31 May 2017 07:44:17 -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 C0E6860C51; Wed, 31 May 2017 14:44:16 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 2E282607C6; Wed, 31 May 2017 14:42:16 +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 595C160B4B; Wed, 31 May 2017 14:42:10 +0000 (UTC) Received: from mail-wm0-f48.google.com (mail-wm0-f48.google.com [74.125.82.48]) by lists.linaro.org (Postfix) with ESMTPS id 6757060694 for ; Wed, 31 May 2017 14:41:25 +0000 (UTC) Received: by mail-wm0-f48.google.com with SMTP id 7so121396818wmo.1 for ; Wed, 31 May 2017 07:41:25 -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=hVxLDku1a8zrKLR2vIKoAx4l+1VfaytVbvwAWNDtx6U=; b=o+XJndDHkteyMDxURjYGJP7fOxKlO1/OiNC1kJ+h90bEcEHO5baYNg+XCxko81Gjqd rw2LV/so9hgefd8PxlfR8Mik/zPiIa5zvubb6NKZBwLKi81YWX8v9UsVW6qI6LQGa4eA 35rVpnNiaa3XxDxj/ZOGZw3hB/MwD9P0Unlco86x9uIPLVrOUluyZZcwgVB09XWsNSl4 CvsOVyXc0D/Er7IuIPcrpdRz5qulxSIlUdHLSpNnmfKxCYk2kWIsgopB3+p23S1dIhQg zTN5L7CfaUcwyQbDgf6Ha7i10uZyxoWjjTH1MIpQs3IPwRNkKw0BXwrPoAOp9eGERIXZ 199g== X-Gm-Message-State: AODbwcBim4stAF7Ge3/yzfe5urpD3Ng7skfDVneXxKGkQsvl2cH43Teg lsn6ZHQ26T+3eCu7f0mu7E39 X-Received: by 10.28.185.200 with SMTP id j191mr5945510wmf.48.1496241683968; Wed, 31 May 2017 07:41:23 -0700 (PDT) Received: from netbricks-team.enea.se ([193.202.22.66]) by smtp.gmail.com with ESMTPSA id e23sm22483032wre.54.2017.05.31.07.41.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 31 May 2017 07:41:23 -0700 (PDT) From: Bogdan Pricope To: lng-odp@lists.linaro.org Date: Wed, 31 May 2017 17:41:00 +0300 Message-Id: <1496241660-27492-7-git-send-email-bogdan.pricope@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1496241660-27492-1-git-send-email-bogdan.pricope@linaro.org> References: <1496241660-27492-1-git-send-email-bogdan.pricope@linaro.org> Subject: [lng-odp] [PATCH 6/6] examples: generator: update odp_generator to use HW checksum capabilities 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 | 107 ++++++++++++++++++++++++++++++++------ 1 file changed, 92 insertions(+), 15 deletions(-) -- 1.9.1 diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 3ec7d8d..78d568a 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -46,6 +46,7 @@ typedef struct { odp_pktio_t pktio; + odp_pktio_config_t config; odp_pktout_queue_t pktout[MAX_WORKERS]; unsigned pktout_count; } interface_t; @@ -92,6 +93,7 @@ static struct { */ typedef struct { odp_pktout_queue_t pktout; /**< Packet output queue to use*/ + odp_pktout_config_opt_t *pktout_cfg; /**< Packet output offload config*/ odp_pool_t pool; /**< Pool for packet IO */ odp_timer_pool_t tp; /**< Timer pool handle */ odp_queue_t tq; /**< Queue for timeouts */ @@ -116,6 +118,9 @@ static args_t *args; /** Barrier to sync threads execution */ static odp_barrier_t barrier; +/** List of interfaces */ +static interface_t *ifs; + /* helper funcs */ static void parse_args(int argc, char *argv[], appl_args_t *appl_args); static void print_info(char *progname, appl_args_t *appl_args); @@ -193,7 +198,8 @@ static int scan_ip(char *buf, unsigned int *paddr) * @return 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) +static odp_packet_t setup_udp_pkt_ref(odp_pool_t pool, + odp_pktout_config_opt_t *pktout_cfg) { odp_packet_t pkt; char *buf; @@ -237,8 +243,10 @@ static odp_packet_t setup_udp_pkt_ref(odp_pool_t pool) udp->src_port = odp_cpu_to_be_16(args->appl.srcport); udp->dst_port = odp_cpu_to_be_16(args->appl.dstport); udp->length = odp_cpu_to_be_16(args->appl.payload + ODPH_UDPHDR_LEN); - udp->chksum = 0; - udp->chksum = odph_ipv4_udp_chksum(pkt); + if (!pktout_cfg->bit.udp_chksum) { + udp->chksum = 0; + udp->chksum = odph_ipv4_udp_chksum(pkt); + } return pkt; } @@ -252,7 +260,8 @@ static odp_packet_t setup_udp_pkt_ref(odp_pool_t pool) * @return Handle of created packet * @retval ODP_PACKET_INVALID Packet could not be created */ -static odp_packet_t pack_udp_pkt(odp_pool_t pool, odp_packet_t pkt_ref) +static odp_packet_t pack_udp_pkt(odp_pool_t pool, odp_packet_t pkt_ref, + odp_pktout_config_opt_t *pktout_cfg) { odp_packet_t pkt; char *buf; @@ -274,7 +283,15 @@ static odp_packet_t pack_udp_pkt(odp_pool_t pool, odp_packet_t pkt_ref) 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 = odph_chksum(ip, ODPH_IPV4HDR_LEN); + if (!pktout_cfg->bit.ipv4_chksum) + ip->chksum = odph_chksum(ip, ODPH_IPV4HDR_LEN); + + if (pktout_cfg->bit.ipv4_chksum || pktout_cfg->bit.udp_chksum) { + odp_packet_l2_offset_set(pkt, 0); + odp_packet_l3_offset_set(pkt, ODPH_ETHHDR_LEN); + odp_packet_l4_offset_set(pkt, ODPH_ETHHDR_LEN + + ODPH_IPV4HDR_LEN); + } return pkt; } @@ -343,7 +360,8 @@ static odp_packet_t setup_icmp_pkt_ref(odp_pool_t pool) * @return Handle of created packet * @retval ODP_PACKET_INVALID Packet could not be created */ -static odp_packet_t pack_icmp_pkt(odp_pool_t pool, odp_packet_t pkt_ref) +static odp_packet_t pack_icmp_pkt(odp_pool_t pool, odp_packet_t pkt_ref, + odp_pktout_config_opt_t *pktout_cfg) { odp_packet_t pkt; char *buf; @@ -368,7 +386,8 @@ static odp_packet_t pack_icmp_pkt(odp_pool_t pool, odp_packet_t pkt_ref) 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 = odph_chksum(ip, ODPH_IPV4HDR_LEN); + if (!pktout_cfg->bit.ipv4_chksum) + ip->chksum = odph_chksum(ip, ODPH_IPV4HDR_LEN); /* icmp */ icmp = (odph_icmphdr_t *)(buf + ODPH_ETHHDR_LEN + ODPH_IPV4HDR_LEN); @@ -382,6 +401,13 @@ 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); + if (pktout_cfg->bit.ipv4_chksum) { + odp_packet_l2_offset_set(pkt, 0); + odp_packet_l3_offset_set(pkt, ODPH_ETHHDR_LEN); + odp_packet_l4_offset_set(pkt, ODPH_ETHHDR_LEN + + ODPH_IPV4HDR_LEN); + } + return pkt; } @@ -422,6 +448,23 @@ static int create_pktio(const char *dev, odp_pool_t pool, dev); return -1; } + + odp_pktio_config_init(&itf->config); + itf->config.pktin.bit.ipv4_chksum = capa.config.pktin.bit.ipv4_chksum; + itf->config.pktin.bit.udp_chksum = capa.config.pktin.bit.udp_chksum; + itf->config.pktin.bit.drop_ipv4_err = + capa.config.pktin.bit.drop_ipv4_err; + itf->config.pktin.bit.drop_udp_err = capa.config.pktin.bit.drop_udp_err; + + itf->config.pktout.bit.ipv4_chksum = capa.config.pktout.bit.ipv4_chksum; + itf->config.pktout.bit.udp_chksum = capa.config.pktout.bit.udp_chksum; + + if (odp_pktio_config(itf->pktio, &itf->config)) { + EXAMPLE_ERR("Error: Failed to set interface configuration %s\n", + dev); + return -1; + } + if (num_rx_queues > capa.max_input_queues) num_rx_queues = capa.max_input_queues; @@ -482,6 +525,7 @@ static int gen_send_thread(void *arg) int ret, i; thread_args_t *thr_args; odp_pktout_queue_t pktout; + odp_pktout_config_opt_t *pktout_cfg; odp_packet_t pkt_array[MAX_UDP_TX_BURST]; int pkt_array_size; int burst_start, burst_size; @@ -491,9 +535,10 @@ static int gen_send_thread(void *arg) thr_args = arg; pktout = thr_args->pktout; + pktout_cfg = thr_args->pktout_cfg; if (args->appl.mode == APPL_MODE_UDP) { - pkt_ref = setup_udp_pkt_ref(thr_args->pool); + pkt_ref = setup_udp_pkt_ref(thr_args->pool, pktout_cfg); pkt_array_size = args->appl.udp_tx_burst; } else if (args->appl.mode == APPL_MODE_PING) { pkt_ref = setup_icmp_pkt_ref(thr_args->pool); @@ -522,7 +567,7 @@ static int gen_send_thread(void *arg) 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); + pkt_ref, pktout_cfg); if (!odp_packet_is_valid(pkt_array[i])) break; } @@ -533,7 +578,8 @@ static int gen_send_thread(void *arg) break; } } else if (args->appl.mode == APPL_MODE_PING) { - pkt_array[0] = pack_icmp_pkt(thr_args->pool, pkt_ref); + pkt_array[0] = pack_icmp_pkt(thr_args->pool, pkt_ref, + pktout_cfg); if (!odp_packet_is_valid(pkt_array[0])) { EXAMPLE_ERR(" [%2i] alloc_single failed\n", thr); @@ -684,6 +730,7 @@ static int gen_recv_thread(void *arg) odp_packet_t pkts[MAX_RX_BURST], pkt; odp_event_t events[MAX_RX_BURST]; int pkt_cnt, ev_cnt, i; + interface_t *itf; thr = odp_thread_id(); (void)arg; @@ -705,6 +752,30 @@ static int gen_recv_thread(void *arg) continue; for (i = 0, pkt_cnt = 0; i < ev_cnt; i++) { pkt = odp_packet_from_event(events[i]); + itf = &ifs[odp_pktio_index(odp_packet_input(pkt))]; + + if (odp_packet_has_ipv4(pkt)) { + if (itf->config.pktin.bit.ipv4_chksum) { + /* HW validation */ + if (odp_packet_has_l3_error(pkt)) + printf("HW detected L3 error\n"); + } /* else SW validation */ + } + + if (odp_packet_has_udp(pkt)) { + if (itf->config.pktin.bit.udp_chksum) { + /* HW validation*/ + if (odp_packet_has_l4_error(pkt)) + printf("HW detected L4 error\n"); + } /* else SW validation */ + } + if (odp_packet_has_tcp(pkt)) { + if (itf->config.pktin.bit.tcp_chksum) { + /* HW validation */ + if (odp_packet_has_l4_error(pkt)) + printf("HW detected L4 error\n"); + } /*else SW validation */ + } /* Drop packets with errors */ if (odp_unlikely(odp_packet_has_error(pkt))) { @@ -714,9 +785,11 @@ static int gen_recv_thread(void *arg) pkts[pkt_cnt++] = pkt; } - print_pkts(thr, pkts, pkt_cnt); + if (pkt_cnt) { + print_pkts(thr, pkts, pkt_cnt); - odp_packet_free_multi(pkts, pkt_cnt); + odp_packet_free_multi(pkts, pkt_cnt); + } } return 0; @@ -810,7 +883,6 @@ int main(int argc, char *argv[]) odp_pool_t tmop; odp_queue_t tq; odp_event_t ev; - interface_t *ifs; odp_instance_t instance; odph_odpthread_params_t thr_params; @@ -972,6 +1044,7 @@ int main(int argc, char *argv[]) abort(); } (void)args->thread[1].pktout; /* Not used*/ + (void)args->thread[1].pktout_cfg; /* Not used*/ args->thread[1].pool = pool; args->thread[1].tp = tp; args->thread[1].tq = tq; @@ -1001,6 +1074,7 @@ int main(int argc, char *argv[]) abort(); } args->thread[0].pktout = ifs[0].pktout[0]; + args->thread[0].pktout_cfg = &ifs[0].config.pktout; args->thread[0].pool = pool; args->thread[0].tp = tp; args->thread[0].tq = tq; @@ -1032,15 +1106,18 @@ int main(int argc, char *argv[]) int (*thr_run_func)(void *); int if_idx, pktout_idx; - if (args->appl.mode == APPL_MODE_RCV) + if (args->appl.mode == APPL_MODE_RCV) { (void)args->thread[i].pktout; /*not used*/ - else { + (void)args->thread[i].pktout_cfg; /*not used*/ + } else { if_idx = i % args->appl.if_count; pktout_idx = (i / args->appl.if_count) % ifs[if_idx].pktout_count; args->thread[i].pktout = ifs[if_idx].pktout[pktout_idx]; + args->thread[i].pktout_cfg = + &ifs[if_idx].config.pktout; } tq = odp_queue_create("", NULL); if (tq == ODP_QUEUE_INVALID) {