From patchwork Wed Nov 1 14:00:20 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: 117702 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp929945qgn; Wed, 1 Nov 2017 07:07:04 -0700 (PDT) X-Google-Smtp-Source: ABhQp+RJtH0/mJQHmYBxdbkSRjUv3MrFez348G1xMyEKD613psulg2rKldESb6WCICcYSSuP21cR X-Received: by 10.36.13.210 with SMTP id 201mr597763itx.95.1509545224664; Wed, 01 Nov 2017 07:07:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509545224; cv=none; d=google.com; s=arc-20160816; b=XrCUCNbXGD/9u1+a5sYoJiwQ9JsyBxwiADwaoXkqerS5OGMONnrCvRx27WLKDJGHcC lC0SWCOTNlDshVfTHgHB9PzMqpXxX+98ZYLtBxU3BC20NqmLgT9b+Ixy0N1xBRe2uBjV Hh/cLyB7MyvJwiBPB7AJqYwIC6YfV7n+G1E7MM+Qciu2VOlCepM0/74bCoSB3LEBrP/W 8IuK3v4HHUCpY6eZG6qEtsSHyKj9IBTGYDn2WIUoo7Q5+4X+6oKBDvEGBRzOVwGtKApP 1f+bJl/G5Z6rrs3UEX7HhVOan6rSb7EV8QMxe2AVGAF7+usb7BDIHSC2aoFuSoqcNpZC gxWg== 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=VUOPnjQtWlWgWfauPUsVwQbXyX7+Q64/9OFeq4tqdnU=; b=rPBCs3LYn+F1AyabDstBrPA87SKA0e0ON/HC2TgQQEcX1n8lD6g+vb1NM4DY13dCmB TVtGENL2L95DQfW/yuPVTp/6nlLr0o7nTilTPv4A0SSlQ94ZwXzAooRXB5axZy8oS0Z3 VnKGgMCGhs5Vhq2DAd7BErDsqnYntJC6d6pTWdMKuwjb96eE62ABuXzTF7Qqn3EDzULN kqeIgqIpLhNeN4wQOO0bB8bMzhLwGS4s5BHMxKn1XouIAHfTH44EYWX40zKzUoFWEa0b AySAV4/4woD8/++Qxh0AJikNT2Qd8WTwnR8eNLnrfkY1gWxk0tR0YQDr6DozSn/Gh2u+ nq9g== 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 h8si673496ioa.85.2017.11.01.07.07.04; Wed, 01 Nov 2017 07:07:04 -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 25C2060D6F; Wed, 1 Nov 2017 14:07:04 +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=-5.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, 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 DBBD761017; Wed, 1 Nov 2017 14:01:26 +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 E5A1E60CDF; Wed, 1 Nov 2017 14:01:18 +0000 (UTC) Received: from forward106p.mail.yandex.net (forward106p.mail.yandex.net [77.88.28.109]) by lists.linaro.org (Postfix) with ESMTPS id 4EEDD60A31 for ; Wed, 1 Nov 2017 14:00:24 +0000 (UTC) Received: from mxback9j.mail.yandex.net (mxback9j.mail.yandex.net [IPv6:2a02:6b8:0:1619::112]) by forward106p.mail.yandex.net (Yandex) with ESMTP id C8E902D83931 for ; Wed, 1 Nov 2017 17:00:22 +0300 (MSK) Received: from smtp3p.mail.yandex.net (smtp3p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:8]) by mxback9j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id MJNvQUFuWt-0MBegYsM; Wed, 01 Nov 2017 17:00:22 +0300 Received: by smtp3p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Y789CXesXJ-0MISqckM; Wed, 01 Nov 2017 17:00:22 +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: Wed, 1 Nov 2017 17:00:20 +0300 Message-Id: <1509544821-5115-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1509544821-5115-1-git-send-email-odpbot@yandex.ru> References: <1509544821-5115-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 245 Subject: [lng-odp] [PATCH API-NEXT v2 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 The functions set L3/L4 checksum override output flags on the packet. Checksum calculation, if requested, is perfromed at packet output time, depending on interface capabilities. 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: d22c949cc466bf28de559855a1cb525740578137 ** Merge commit sha: 3ee6c4da5a3b375e5eb87b9e656668e4fd6c8d73 **/ 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 3b2fac212..0ad1a9329 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -1284,6 +1284,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 insert) +{ + 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 = insert; +} + +void odp_packet_l4_chksum_insert(odp_packet_t pkt, int insert) +{ + 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 = insert; +} + 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 Wed Nov 1 14:00:21 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: 117701 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp928917qgn; Wed, 1 Nov 2017 07:06:18 -0700 (PDT) X-Google-Smtp-Source: ABhQp+RRdsqgM9xTbo38digOC6YCikhZobdIR8N2ie0TN48DVVv/mm6Lv2igmQSYb+pqXCKAVbB0 X-Received: by 10.107.200.6 with SMTP id y6mr7079487iof.123.1509545178329; Wed, 01 Nov 2017 07:06:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509545178; cv=none; d=google.com; s=arc-20160816; b=DMvynF4fbfjPvPLwIOjGe+Gfo8mNJRHhZNPIs+OMsbY46dbjUhVezqLsHbe50mYVuv VJNEulbRQGXqu3MwvVRCUGiT+R7zluEbgqEGw87BtCj8YHBCTx60sQ+9V8FjkH3C7z3P tvLtp9orNEJHkzetBGm/zMLoQpXQigoqqUPql7jGgZqSov01SD6uasm0Q2cj69CK6TKx NDKFsyXeWHGz/KORhTRviR2XGqdo0+40J3vzGlwEC0sf1NzGvcU7ZmtyuSPrz4Mayo9z h22cBbvv8amrQa8/WYeWdfkDSBdNBAHdkjira8hhxjpaKgajuu9JKZUJjm/xxJ7/0lTk /m9A== 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=g9ok1O5RncvKbkwWONkBmL+oVZy1EnI+LONK7X8gAJQ=; b=vDOa7t9FT91kxazWEEa9/HEOIfTOi0TnIqoRa/D7FyFczZxlDxiCj6RJ++RS5khIP9 FieukFmkVSjxnNUBEjirlj9y80SGaj+H1j3vR4wJ30QRd0/6KxpS/2RePjkIe4fsRawD GANFwZCWlHLcEDdLlSL4qECbKWmZnkKsn2g0gSlpo5AMkEjQWsuwty40P6imjl1URTuD PFjFIF4nnE+iBDyQJyXhI6v4Q64Dt3PYHl8LMvAZijBHXD5l+EHhryBDb6HbbNAzFdTg 4YI/LhLtregXgFVzw2rPVTp+MmFwGiEXa1Vb6XcemUycxYj6PB7W+PdXv8hdOvJZ0vWn x7+Q== 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 f7si745186iob.38.2017.11.01.07.06.18; Wed, 01 Nov 2017 07:06:18 -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 E0EA260B2B; Wed, 1 Nov 2017 14:06:17 +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=-5.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, 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 9EF5760C1C; Wed, 1 Nov 2017 14:01:23 +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 AECE460A0B; Wed, 1 Nov 2017 14:01:15 +0000 (UTC) Received: from forward105o.mail.yandex.net (forward105o.mail.yandex.net [37.140.190.183]) by lists.linaro.org (Postfix) with ESMTPS id CFC2160B2B for ; Wed, 1 Nov 2017 14:00:24 +0000 (UTC) Received: from mxback13g.mail.yandex.net (mxback13g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:92]) by forward105o.mail.yandex.net (Yandex) with ESMTP id 3A5C84443BEC for ; Wed, 1 Nov 2017 17:00:23 +0300 (MSK) Received: from smtp3p.mail.yandex.net (smtp3p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:8]) by mxback13g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id foJgA5Lnwt-0NvKvuDH; Wed, 01 Nov 2017 17:00:23 +0300 Received: by smtp3p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Y789CXesXJ-0MIe2mO5; Wed, 01 Nov 2017 17:00:22 +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: Wed, 1 Nov 2017 17:00:21 +0300 Message-Id: <1509544821-5115-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1509544821-5115-1-git-send-email-odpbot@yandex.ru> References: <1509544821-5115-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 245 Subject: [lng-odp] [PATCH API-NEXT v2 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 Add checksum insertion override functionality to dpdk pktio. Override is applied based on L3/L4 checksum insert override output flags from the packet. 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: d22c949cc466bf28de559855a1cb525740578137 ** Merge commit sha: 3ee6c4da5a3b375e5eb87b9e656668e4fd6c8d73 **/ 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 9782d60c4..301ca10cb 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -503,7 +503,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) @@ -519,11 +523,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; @@ -566,6 +580,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)))) { @@ -586,8 +602,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); } @@ -679,6 +695,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; @@ -696,8 +714,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; @@ -719,8 +737,9 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, mbuf_init((struct rte_mempool *) pool_entry->ext_desc, 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)); }