From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f52.google.com (mail-wm0-f52.google.com [74.125.82.52]) by dpdk.org (Postfix) with ESMTP id D2DDC9E7 for ; Wed, 9 Nov 2016 10:58:24 +0100 (CET) Received: by mail-wm0-f52.google.com with SMTP id t79so289771836wmt.0 for ; Wed, 09 Nov 2016 01:58:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references:mime-version:content-transfer-encoding; bh=sg7z1GKlYD6evVVzl+Nlq7meKuldcX8Lrvg3FV4JDpM=; b=T5KdgceBRUcruBs6Bu7JlTW9l22HDDh2QrdG2WS0BAbSdWrBslloxkfu+YAyagEHC+ cYy9veOmVJ3HaMfRzMjKX/lHOKD/v07+4QMa2pLfS1A9GDqWFOJLES0RYssRy8azU7dw NbSeEugksEp2c33MW2UB7QHmpynive7LvmGP6MvinBqxkKYd3bPr/IPd68RHIAnn8HeU +2tvYYkioGBDo87mGSSxjjoyAzLL/y3t52HZ1jXeiOKImrA7+vMKPNrby0zC2J5vBbBW MWZJz+qBo9whwlEA1QhWNNGt0umKKDok4PSSwP4IrDbz9RseTPfB9v2ZDQ0sCMbbtWsV hnFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references:mime-version :content-transfer-encoding; bh=sg7z1GKlYD6evVVzl+Nlq7meKuldcX8Lrvg3FV4JDpM=; b=aUOmL/2wJLeo5Tt4YwsgBk+a5jgONg4YC/ReFuytTHteCWSoVXBxi+dTfdvj6Ge+Z9 eEcDwlexksqYobZshK3xaeKDVdpt675Hmo9C659a0S+kg8BYTz7aqqrCg3yA5WvWa/nb ukBw805M2IuLZLZ+12LTKR66peIBi1JYoQPmJMhHV2Yr07ZwONpwvyYoeqg4ZA/aMxYc U4mbOMiNkTdn9wnDQBxoK0O5h9FNVHNu/nUN7R8j7b00kDgXCmLdqxqfqZZrAZzSnhv5 QafCp/Xy1MvEkIBkzu2S8opvXMzDKLkyfVyohdBoAPjcBJ5zBzCCyPrY5aXMaBCKw3lW d4mQ== X-Gm-Message-State: ABUngvcvBDjA9frJoLR/feVs+6rgb/PX7L5Qis2sIoSF/R7J4G5HAH3YvBuCVk2ECm1f+uJw X-Received: by 10.28.178.205 with SMTP id b196mr16332060wmf.8.1478685504314; Wed, 09 Nov 2016 01:58:24 -0800 (PST) Received: from ping.vm.6wind.com (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by smtp.gmail.com with ESMTPSA id c133sm13926057wme.12.2016.11.09.01.58.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 Nov 2016 01:58:23 -0800 (PST) From: Nelio Laranjeiro To: stable@dpdk.org, Yuanhan Liu Cc: =?UTF-8?q?N=C3=A9lio=20Laranjeiro?= , Adrien Mazarguil Date: Wed, 9 Nov 2016 10:57:47 +0100 Message-Id: <238c808d14597ec1a55d8f33b07361b1e80c5b66.1478683594.git.nelio.laranjeiro@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH v2 08/12] net/mlx5: re-factorize functions X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Nov 2016 09:58:25 -0000 From: Nélio Laranjeiro [ upstream commit d772d4408d3f71d89ab2c50bf02c553c9e11d4db ] Rework logic of wqe_write() and wqe_write_vlan() which are pretty similar to keep a single one. Signed-off-by: Nelio Laranjeiro --- drivers/net/mlx5/mlx5_rxtx.c | 98 ++++++++++---------------------------------- 1 file changed, 22 insertions(+), 76 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c index 59e8183..47d6d68 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c @@ -290,8 +290,8 @@ txq_mp2mr(struct txq *txq, struct rte_mempool *mp) * Pointer to TX queue structure. * @param wqe * Pointer to the WQE to fill. - * @param addr - * Buffer data address. + * @param buf + * Buffer. * @param length * Packet length. * @param lkey @@ -299,54 +299,24 @@ txq_mp2mr(struct txq *txq, struct rte_mempool *mp) */ static inline void mlx5_wqe_write(struct txq *txq, volatile union mlx5_wqe *wqe, - uintptr_t addr, uint32_t length, uint32_t lkey) -{ - wqe->wqe.ctrl.data[0] = htonl((txq->wqe_ci << 8) | MLX5_OPCODE_SEND); - wqe->wqe.ctrl.data[1] = htonl((txq->qp_num_8s) | 4); - wqe->wqe.ctrl.data[2] = 0; - wqe->wqe.ctrl.data[3] = 0; - wqe->inl.eseg.rsvd0 = 0; - wqe->inl.eseg.rsvd1 = 0; - wqe->inl.eseg.mss = 0; - wqe->inl.eseg.rsvd2 = 0; - wqe->wqe.eseg.inline_hdr_sz = htons(MLX5_ETH_INLINE_HEADER_SIZE); - /* Copy the first 16 bytes into inline header. */ - rte_memcpy((uint8_t *)(uintptr_t)wqe->wqe.eseg.inline_hdr_start, - (uint8_t *)(uintptr_t)addr, - MLX5_ETH_INLINE_HEADER_SIZE); - addr += MLX5_ETH_INLINE_HEADER_SIZE; - length -= MLX5_ETH_INLINE_HEADER_SIZE; - /* Store remaining data in data segment. */ - wqe->wqe.dseg.byte_count = htonl(length); - wqe->wqe.dseg.lkey = lkey; - wqe->wqe.dseg.addr = htonll(addr); - /* Increment consumer index. */ - ++txq->wqe_ci; -} - -/** - * Write a regular WQE with VLAN. - * - * @param txq - * Pointer to TX queue structure. - * @param wqe - * Pointer to the WQE to fill. - * @param addr - * Buffer data address. - * @param length - * Packet length. - * @param lkey - * Memory region lkey. - * @param vlan_tci - * VLAN field to insert in packet. - */ -static inline void -mlx5_wqe_write_vlan(struct txq *txq, volatile union mlx5_wqe *wqe, - uintptr_t addr, uint32_t length, uint32_t lkey, - uint16_t vlan_tci) + struct rte_mbuf *buf, uint32_t length, uint32_t lkey) { - uint32_t vlan = htonl(0x81000000 | vlan_tci); - + uintptr_t addr = rte_pktmbuf_mtod(buf, uintptr_t); + + rte_mov16((uint8_t *)&wqe->wqe.eseg.inline_hdr_start, + (uint8_t *)addr); + addr += 16; + length -= 16; + /* Need to insert VLAN ? */ + if (buf->ol_flags & PKT_TX_VLAN_PKT) { + uint32_t vlan = htonl(0x81000000 | buf->vlan_tci); + + memcpy((uint8_t *)&wqe->wqe.eseg.inline_hdr_start + 12, + &vlan, sizeof(vlan)); + addr -= sizeof(vlan); + length += sizeof(vlan); + } + /* Write the WQE. */ wqe->wqe.ctrl.data[0] = htonl((txq->wqe_ci << 8) | MLX5_OPCODE_SEND); wqe->wqe.ctrl.data[1] = htonl((txq->qp_num_8s) | 4); wqe->wqe.ctrl.data[2] = 0; @@ -355,20 +325,7 @@ mlx5_wqe_write_vlan(struct txq *txq, volatile union mlx5_wqe *wqe, wqe->inl.eseg.rsvd1 = 0; wqe->inl.eseg.mss = 0; wqe->inl.eseg.rsvd2 = 0; - wqe->wqe.eseg.inline_hdr_sz = htons(MLX5_ETH_VLAN_INLINE_HEADER_SIZE); - /* - * Copy 12 bytes of source & destination MAC address. - * Copy 4 bytes of VLAN. - * Copy 2 bytes of Ether type. - */ - rte_memcpy((uint8_t *)(uintptr_t)wqe->wqe.eseg.inline_hdr_start, - (uint8_t *)(uintptr_t)addr, 12); - rte_memcpy((uint8_t *)((uintptr_t)wqe->wqe.eseg.inline_hdr_start + 12), - &vlan, sizeof(vlan)); - rte_memcpy((uint8_t *)((uintptr_t)wqe->wqe.eseg.inline_hdr_start + 16), - (uint8_t *)((uintptr_t)addr + 12), 2); - addr += MLX5_ETH_VLAN_INLINE_HEADER_SIZE - sizeof(vlan); - length -= MLX5_ETH_VLAN_INLINE_HEADER_SIZE - sizeof(vlan); + wqe->wqe.eseg.inline_hdr_sz = htons(16); /* Store remaining data in data segment. */ wqe->wqe.dseg.byte_count = htonl(length); wqe->wqe.dseg.lkey = lkey; @@ -609,7 +566,6 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) do { struct rte_mbuf *buf = *(pkts++); unsigned int elts_head_next; - uintptr_t addr; uint32_t length; uint32_t lkey; unsigned int segs_n = buf->nb_segs; @@ -631,8 +587,6 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) rte_prefetch0(wqe); if (pkts_n) rte_prefetch0(*pkts); - /* Retrieve buffer information. */ - addr = rte_pktmbuf_mtod(buf, uintptr_t); length = DATA_LEN(buf); /* Update element. */ (*txq->elts)[elts_head] = buf; @@ -642,11 +596,7 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) volatile void *)); /* Retrieve Memory Region key for this memory pool. */ lkey = txq_mp2mr(txq, txq_mb2mp(buf)); - if (buf->ol_flags & PKT_TX_VLAN_PKT) - mlx5_wqe_write_vlan(txq, wqe, addr, length, lkey, - buf->vlan_tci); - else - mlx5_wqe_write(txq, wqe, addr, length, lkey); + mlx5_wqe_write(txq, wqe, buf, length, lkey); /* Should we enable HW CKSUM offload */ if (buf->ol_flags & (PKT_TX_IP_CKSUM | PKT_TX_TCP_CKSUM | PKT_TX_UDP_CKSUM)) { @@ -810,11 +760,7 @@ mlx5_tx_burst_inline(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) } else { /* Retrieve Memory Region key for this memory pool. */ lkey = txq_mp2mr(txq, txq_mb2mp(buf)); - if (buf->ol_flags & PKT_TX_VLAN_PKT) - mlx5_wqe_write_vlan(txq, wqe, addr, length, - lkey, buf->vlan_tci); - else - mlx5_wqe_write(txq, wqe, addr, length, lkey); + mlx5_wqe_write(txq, wqe, buf, length, lkey); } while (--segs_n) { /* -- 2.1.4