From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f46.google.com (mail-wm0-f46.google.com [74.125.82.46]) by dpdk.org (Postfix) with ESMTP id 0B472FFA for ; Tue, 8 Nov 2016 11:37:47 +0100 (CET) Received: by mail-wm0-f46.google.com with SMTP id f82so171765622wmf.1 for ; Tue, 08 Nov 2016 02:37:47 -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=sG613XgY0hdQcMwCkYFExEQtLJL3bH7muw60W8tsaL0=; b=Y+crunE1G4uci4xCuRhT+eoPGBpUtMfZ/xl72OmFoaP5JHmErPG2Or119EhQRmNWIq w4rucjTEbPVNnZEjoU4D6UJA12iW/we9wLUiSCB8Q1rr2cNRTTIt9XCr/7cYQ8e4ycDz hqyCR+s7SQHPZOfZtpeuGoXJZvbkgmCvjwPpKS1JoCnmE3JjCKI+5LvdQkRtkxFe01K7 HOs/E/xzCbefzt1PYn3TsNAb5WTvTKVYLtXDbSBUPUMRQIpbqyU5GhwecqLlpt8Uk9X+ UbwaRjlFXdfaOJtel3BXvPMtqT5bALwLU06+YvoBtGTn9eVL2UIlVip8AgBce3jZ/oxl feBQ== 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=sG613XgY0hdQcMwCkYFExEQtLJL3bH7muw60W8tsaL0=; b=YJfj1RPhWG3iSs5/EnRAQSoPzZmpr9Pl4FwKagFUgl5cJkbXZCjSAhZed7xZg4MBX2 juTrgiNnIu0o44V787CoHeKwA1+U7zp8ysAOJxQ+VnD9UNweQWl3X0WNUlMpl74xb/9/ 4ieu1qzoD8bQNKTQu+36oIiLL/Io23zk6o0PJQLXiAtQkCO0fDDvkF/aOyPYDdoLzeMI /GX6VhqNLj9A/gZc8OVIiDifcAc0Q9rgyvx5IqSgxBoGFmHlcsHH0w5hxwhBUV2FEBw6 wi1dWcE+FTD9A30goXPVpeh0V5fmjoRmTaE+Uhdfc3UeWzZFBj0KtgeaEbaGcM2DW9KF sBUg== X-Gm-Message-State: ABUngvcBPYF1W7a7ysDAJQnn6/vpMejc7/fnxnPtIX2/z2YF8y1wk3BMFG9qwB7AteJ8Swiv X-Received: by 10.28.97.139 with SMTP id v133mr15707820wmb.117.1478601467585; Tue, 08 Nov 2016 02:37:47 -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 k74sm18837414wmd.18.2016.11.08.02.37.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 08 Nov 2016 02:37:47 -0800 (PST) From: Nelio Laranjeiro To: stable@dpdk.org, Yuanhan Liu Cc: =?UTF-8?q?N=C3=A9lio=20Laranjeiro?= , Adrien Mazarguil Date: Tue, 8 Nov 2016 11:36:49 +0100 Message-Id: <99cabc27227404364f02fedd2a0bd30161bde338.1478600855.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 08/14] 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: Tue, 08 Nov 2016 10:37:48 -0000 From: Nélio Laranjeiro 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