From patchwork Mon Nov 13 09:00:14 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: 118719 Delivered-To: patch@linaro.org Received: by 10.80.225.132 with SMTP id k4csp821866edl; Mon, 13 Nov 2017 01:01:48 -0800 (PST) X-Google-Smtp-Source: AGs4zMZJQ7KPFIfx5P5k7exJHNRXO1TxhknEPcwXMOZTPTlrSJdim2ww/bPLWRswdmSX2goXUXKB X-Received: by 10.237.62.4 with SMTP id l4mr4503399qtf.331.1510563708019; Mon, 13 Nov 2017 01:01:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510563708; cv=none; d=google.com; s=arc-20160816; b=RhaN3lCQD3+H4iBg5I/1xxyotEz3HU3iVdWJ9ZJRsk8pyMc9Amw1D7vhV1BdkFSONe HKck7gjRP8N6IhaTN70Txmhr5Ujy7zdEPzJm3lRNezlV79RCacyAiw8dsXyC+KZrGTXS EaL6WmPCUTuEwYa9vOYog4DXaRe0804yXXvpSWabotlv5kKP/u0NG/qNViRCxAzdRIB6 +xu83vMb1/1u4HdGa7sfhuSorrPHK/hSBYzkfMVxPZz2xrV3H4jM+xz8Uj53mCqxGzaB p7LhL9vuj/05iB8Iks5fPGSqyHidVA1HbFQaZQu9G2AXRwzwzKkiNovXk92VFqUj+aPW u9uA== 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=XvvO6+LyooDhBBtkzc6nWHB9BTa4w6FPWNuygrj4WqA=; b=WaOFZ/6jxJCCNOfRwjeo179j0BxbjQoHjll7KPH9C+r/YX77OnGsV1XDnRXzD+DjEh 0EzCNdJOGP+FGas2jiHn2E5wsuyPnzjVYZG788m+nZBeymH8+lN1rKsKXhMxbgZtgO+b 3XE+UNjnAtC3v1ORZyCTsYtG9OkAIUXe2oSHZysNXT2jVxGq5JtBoGRF1gJ5fQBtExvZ AgyYbIoHhc1/wlh6fWdM5aVRopm5gnrLPu2ly7r5DHWSFzX8qNWcB1QTz7HT5ob3UIUv vpCe59eKbadeMwfBD4931ui600LlYNXfdlV7GCsLdgRoQyjoqAKYjCPU5PK3MmdwR4Ev 7E4Q== 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 g88si1908222qkh.161.2017.11.13.01.01.47; Mon, 13 Nov 2017 01:01:48 -0800 (PST) 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 ABA8660BD7; Mon, 13 Nov 2017 09:01:47 +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 CA4BC60BDF; Mon, 13 Nov 2017 09:00:30 +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 AAA3F6068A; Mon, 13 Nov 2017 09:00:26 +0000 (UTC) Received: from forward105o.mail.yandex.net (forward105o.mail.yandex.net [37.140.190.183]) by lists.linaro.org (Postfix) with ESMTPS id 2504F6068A for ; Mon, 13 Nov 2017 09:00:20 +0000 (UTC) Received: from mxback12g.mail.yandex.net (mxback12g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:91]) by forward105o.mail.yandex.net (Yandex) with ESMTP id 38CA14442B6E for ; Mon, 13 Nov 2017 12:00:17 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback12g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id eejIhEZswQ-0Hm8MumG; Mon, 13 Nov 2017 12:00:17 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id l8EarKD0io-0GvuONZq; Mon, 13 Nov 2017 12:00:16 +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: Mon, 13 Nov 2017 12:00:14 +0300 Message-Id: <1510563614-7352-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510563614-7352-1-git-send-email-odpbot@yandex.ru> References: <1510563614-7352-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 245 Subject: [lng-odp] [PATCH API-NEXT v3 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: a908a4dead95321e84d6a8a23de060051dcd8969 ** Merge commit sha: 53e4dcc080039e61dbb9b6b46f7f06a8306631e0 **/ 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 764ed37d4..99b79e32e 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -526,7 +526,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) @@ -542,11 +546,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; @@ -589,6 +603,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)))) { @@ -609,8 +625,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); } @@ -702,6 +718,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; @@ -719,8 +737,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; @@ -742,8 +760,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)); }