From patchwork Fri Oct 20 11:00:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 116480 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp11752edb; Fri, 20 Oct 2017 04:02:25 -0700 (PDT) X-Google-Smtp-Source: ABhQp+SO1guR7DENG5Ueh/6yGTkj7U5ij25XaHq4FRhfcxgH1tgLfM2NMFd2YcOmvBTXx+Axxg5k X-Received: by 10.55.16.151 with SMTP id 23mr5976455qkq.225.1508497345062; Fri, 20 Oct 2017 04:02:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508497345; cv=none; d=google.com; s=arc-20160816; b=ArtJScs0Jlm5K1Rp4V0neliojnBQLZBx67ejHR9gKqCrS5RzIZDxMmHvstNDYPWn1b Q1zW9aXQjSKiPs6dJK2v/0SfyAuW/1IKzWiLkeN/DutAMO4ZjFZjI0gqIN8MWIjRaMhr h0F15tIKTjdy0nQYGW+CpH0sBhZRMdohOYCQya28ST9lgKzKV/8RW5CJRjqa3Wpxw0/k i9Yiixo+Hi0Dj+xbcs1rxvLAtwAE3S8MTeyu1wb2k+Ii6S4w3p7lNqeHOn1wJb4GI+OA +oyBV6zuh8PNeV6FqmxH3NlXvnKzt0KubuH4J14S1d3Ho5nG8FoJAsiGucLoqRfjLrJA hgGQ== 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:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=S+LX/TmbAWN0v30CkOLLKODysZ4iV58ncZkFqUFJXck=; b=MgCYtDiXRLrIYMPkn0dRx1srwRU6v+Fr8rpe3R7e+XBDEKmu4P/Hbzu05VoosOnIm0 x59jJvYWeK95I5XBH5kO1Y8D3O6EkgPFqkaV7ooOWKGPELljwo84p2dB7C927thWdzrT NSoSu4likqG6lTcJLgojBeEmwwZj/gPYji3C0MjYjXOTiD8Bn5Y8KQqhRx2DOsufMPK8 UiQaaH2WECGwa97JoQ8OwY/2aVlFu5OPcu5G3swnEplVW1NmVNF4qarO1DPYd3dEVbYI amHEJkCk1BOv3+VYZ53iz1uj4+F4Y5I+zJNU766QxtNBcJeSxlzxXTzri18Bbw7VZl4c Dvng== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id r189si529471qkd.255.2017.10.20.04.02.24; Fri, 20 Oct 2017 04:02:25 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 964E260BD7; Fri, 20 Oct 2017 11:02:24 +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=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,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 26FD460C12; Fri, 20 Oct 2017 11:00:28 +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 CB8066090E; Fri, 20 Oct 2017 11:00:17 +0000 (UTC) Received: from forward105p.mail.yandex.net (forward105p.mail.yandex.net [77.88.28.108]) by lists.linaro.org (Postfix) with ESMTPS id 5B54F6090E for ; Fri, 20 Oct 2017 11:00:11 +0000 (UTC) Received: from mxback1g.mail.yandex.net (mxback1g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:162]) by forward105p.mail.yandex.net (Yandex) with ESMTP id 048F840849D6 for ; Fri, 20 Oct 2017 14:00:10 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback1g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id CZuyy624SL-09SKAt3x; Fri, 20 Oct 2017 14:00:10 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id icu2LN5aGp-09mi8Odl; Fri, 20 Oct 2017 14:00:09 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Fri, 20 Oct 2017 14:00:04 +0300 Message-Id: <1508497205-26048-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508497205-26048-1-git-send-email-odpbot@yandex.ru> References: <1508497205-26048-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 245 Subject: [lng-odp] [PATCH API-NEXT v1 1/2] linux-gen: chksum: implement checksum insertion override functions 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" From: Bogdan Pricope Immplement L3/L4 checksum insertion override functions Signed-off-by: Bogdan Pricope --- /** Email created from pull request 245 (bogdanPricope:api_next_ovr_csum_ref_pr) ** https://github.com/Linaro/odp/pull/245 ** Patch: https://github.com/Linaro/odp/pull/245.patch ** Base sha: e3108af2f0b58c2ceca422b418439bba5de04b11 ** Merge commit sha: 00977685a347be03999a0215c3e038558df8be4c **/ platform/linux-generic/odp_packet.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 68a834a12..07dfdc617 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -1259,6 +1259,22 @@ int odp_packet_l4_offset_set(odp_packet_t pkt, uint32_t offset) return 0; } +void odp_packet_l3_chksum_insert(odp_packet_t pkt, int l3) +{ + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); + + pkt_hdr->p.output_flags.l3_chksum_set = 1; + pkt_hdr->p.output_flags.l3_chksum = l3; +} + +void odp_packet_l4_chksum_insert(odp_packet_t pkt, int l4) +{ + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); + + pkt_hdr->p.output_flags.l4_chksum_set = 1; + pkt_hdr->p.output_flags.l4_chksum = l4; +} + void odp_packet_flow_hash_set(odp_packet_t pkt, uint32_t flow_hash) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); From patchwork Fri Oct 20 11:00:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 116479 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp9902edb; Fri, 20 Oct 2017 04:01:00 -0700 (PDT) X-Google-Smtp-Source: ABhQp+Skq7pR1o2R8A4Tjb72EAQ7rCg5VEMa5awHASDqwBbocvAmCritwZQSo9ZQymZbq7mqEFJe X-Received: by 10.237.53.212 with SMTP id d20mr6719653qte.10.1508497260074; Fri, 20 Oct 2017 04:01:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508497260; cv=none; d=google.com; s=arc-20160816; b=sNdWphNnRXs8N7U5453++Nc7oR0YmbhZdtrtw2gHrIZmRKRemmCFOikx/0StZ2eEkI sYJuPzfec6l6xb6QbGhBFcj2t7nRPZptrrGKCcEVPaODw2EAkK3MLl1PwnTKZrQoRrg6 cK36kSTDiUYIsdT7MQQfMZoCrRQtoRNFThbUNQqE0Z0Gj31Wq9oGqjX7YPEN5VrznlM6 8Oai0jtxfYgtYP2y9MrFoX6XVdzULqev9RAjJ5ItBJ+X0XUyQokCcQ1ypPh8H69TDFG/ DUfl5D3g+TPgvttvV6eUdNVc/ebe6k1rK3X7y0/LhMlQGk6xIQPCeObYSN6HgPlUGWS/ Wa8g== 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:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=LdOKqOcvthKNaDYfDMqvqIny2EyzLoR4vEGTDsNe4Hw=; b=KtDnun51P43Nda4NlHaFuQ9TasX3Cod8zvzJrRjqZTd/q6pyq2VbtTGpBzAggYK5Lx hOiDIZp631HqXit/q5ZpjkmM8/4RnzlM7rcWgBK81IMzuCnSAYwCPusZ6d/nOx4jxU+n DZT53/YZu0FOP31T1W1mtM1tPhH+L23tw6HywYd/b8YFrZR0m11lvO5O5jLEcwyLSvDW HYL0IkgNx0hcDuwvT3ZggXRFpmIDKGVYxWggokvZgv4WzSPMK+EACp7zATXX1pLgaGi/ X8HKNZhE0+aUvV/vpGnOYnRjVeJK7KRo7flhDz2hMf1vEf/MEX1Yl0D5QwqBNUhAbknz 5jGw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id w30si545469qte.219.2017.10.20.04.00.59; Fri, 20 Oct 2017 04:01:00 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 9D75D60B4C; Fri, 20 Oct 2017 11:00:59 +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=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,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 0AF6B60B4E; Fri, 20 Oct 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 A23CD60B22; Fri, 20 Oct 2017 11:00:13 +0000 (UTC) Received: from forward101o.mail.yandex.net (forward101o.mail.yandex.net [37.140.190.181]) by lists.linaro.org (Postfix) with ESMTPS id 427AF60B15 for ; Fri, 20 Oct 2017 11:00:12 +0000 (UTC) Received: from mxback6j.mail.yandex.net (mxback6j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10f]) by forward101o.mail.yandex.net (Yandex) with ESMTP id 980051344891 for ; Fri, 20 Oct 2017 14:00:10 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback6j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id FTaWUU6j53-0ATaJhhJ; Fri, 20 Oct 2017 14:00:10 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id icu2LN5aGp-0AmeKaYp; Fri, 20 Oct 2017 14:00:10 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Fri, 20 Oct 2017 14:00:05 +0300 Message-Id: <1508497205-26048-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508497205-26048-1-git-send-email-odpbot@yandex.ru> References: <1508497205-26048-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 245 Subject: [lng-odp] [PATCH API-NEXT v1 2/2] linux-gen: pktio: dpdk: implement checksum insertion override 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" From: Bogdan Pricope Implement checksum insertion override for dpdk pktio Signed-off-by: Bogdan Pricope --- /** Email created from pull request 245 (bogdanPricope:api_next_ovr_csum_ref_pr) ** https://github.com/Linaro/odp/pull/245 ** Patch: https://github.com/Linaro/odp/pull/245.patch ** Base sha: e3108af2f0b58c2ceca422b418439bba5de04b11 ** Merge commit sha: 00977685a347be03999a0215c3e038558df8be4c **/ platform/linux-generic/pktio/dpdk.c | 41 +++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 45153af82..f9209f66e 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -473,7 +473,11 @@ static inline uint16_t phdr_csum(odp_bool_t ipv4, void *l3_hdr, return rte_ipv6_phdr_cksum(l3_hdr, ol_flags); } +#define OL_TX_CHKSUM_PKT(_cfg, _capa, _proto, _ovr_set, _ovr) \ + (_capa && _proto && (_ovr_set ? _ovr : _cfg)) + static inline void pkt_set_ol_tx(odp_pktout_config_opt_t *pktout_cfg, + odp_pktout_config_opt_t *pktout_capa, odp_packet_hdr_t *pkt_hdr, struct rte_mbuf *mbuf, char *mbuf_data) @@ -489,11 +493,21 @@ static inline void pkt_set_ol_tx(odp_pktout_config_opt_t *pktout_cfg, if (check_proto(l3_hdr, &l3_proto_v4, &l4_proto)) return; - ipv4_chksum_pkt = pktout_cfg->bit.ipv4_chksum && l3_proto_v4; - udp_chksum_pkt = pktout_cfg->bit.udp_chksum && - (l4_proto == _ODP_IPPROTO_UDP); - tcp_chksum_pkt = pktout_cfg->bit.tcp_chksum && - (l4_proto == _ODP_IPPROTO_TCP); + ipv4_chksum_pkt = OL_TX_CHKSUM_PKT(pktout_cfg->bit.ipv4_chksum, + pktout_capa->bit.ipv4_chksum, + l3_proto_v4, + pkt_p->output_flags.l3_chksum_set, + pkt_p->output_flags.l3_chksum); + udp_chksum_pkt = OL_TX_CHKSUM_PKT(pktout_cfg->bit.udp_chksum, + pktout_capa->bit.udp_chksum, + (l4_proto == _ODP_IPPROTO_UDP), + pkt_p->output_flags.l4_chksum_set, + pkt_p->output_flags.l4_chksum); + tcp_chksum_pkt = OL_TX_CHKSUM_PKT(pktout_cfg->bit.tcp_chksum, + pktout_capa->bit.tcp_chksum, + (l4_proto == _ODP_IPPROTO_TCP), + pkt_p->output_flags.l4_chksum_set, + pkt_p->output_flags.l4_chksum); if (!ipv4_chksum_pkt && !udp_chksum_pkt && !tcp_chksum_pkt) return; @@ -536,6 +550,8 @@ static inline int pkt_to_mbuf(pktio_entry_t *pktio_entry, char *data; uint16_t pkt_len; odp_pktout_config_opt_t *pktout_cfg = &pktio_entry->s.config.pktout; + odp_pktout_config_opt_t *pktout_capa = + &pktio_entry->s.pkt_dpdk.capa.config.pktout; if (odp_unlikely((rte_pktmbuf_alloc_bulk(pkt_dpdk->pkt_pool, mbuf_table, num)))) { @@ -556,8 +572,8 @@ static inline int pkt_to_mbuf(pktio_entry_t *pktio_entry, odp_packet_copy_to_mem(pkt_table[i], 0, pkt_len, data); - if (pktout_cfg->all_bits) - pkt_set_ol_tx(pktout_cfg, + if (pktout_capa->all_bits) + pkt_set_ol_tx(pktout_cfg, pktout_capa, odp_packet_hdr(pkt_table[i]), mbuf_table[i], data); } @@ -649,6 +665,8 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, { pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk; odp_pktout_config_opt_t *pktout_cfg = &pktio_entry->s.config.pktout; + odp_pktout_config_opt_t *pktout_capa = + &pktio_entry->s.pkt_dpdk.capa.config.pktout; int i; *copy_count = 0; @@ -666,8 +684,8 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, pkt_hdr->extra_type == PKT_EXTRA_TYPE_DPDK)) { mbuf_update(mbuf, pkt_hdr, pkt_len); - if (pktout_cfg->all_bits) - pkt_set_ol_tx(pktout_cfg, pkt_hdr, + if (pktout_capa->all_bits) + pkt_set_ol_tx(pktout_cfg, pktout_capa, pkt_hdr, mbuf, odp_packet_data(pkt)); } else { pool_t *pool_entry = pkt_hdr->buf_hdr.pool_ptr; @@ -684,8 +702,9 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, mbuf_init(pkt_dpdk->pkt_pool, mbuf, pkt_hdr); mbuf_update(mbuf, pkt_hdr, pkt_len); - if (pktout_cfg->all_bits) - pkt_set_ol_tx(pktout_cfg, pkt_hdr, + if (pktout_capa->all_bits) + pkt_set_ol_tx(pktout_cfg, pktout_capa, + pkt_hdr, mbuf, odp_packet_data(pkt)); }