From patchwork Wed Oct 11 18:32:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrien Mazarguil X-Patchwork-Id: 30169 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2AC7C1B21C; Wed, 11 Oct 2017 20:32:38 +0200 (CEST) Received: from mail-wm0-f50.google.com (mail-wm0-f50.google.com [74.125.82.50]) by dpdk.org (Postfix) with ESMTP id 5C3C01B201 for ; Wed, 11 Oct 2017 20:32:26 +0200 (CEST) Received: by mail-wm0-f50.google.com with SMTP id i124so7282573wmf.3 for ; Wed, 11 Oct 2017 11:32:26 -0700 (PDT) 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; bh=CqO+pUiMFFdyaLPwbkn+Cj2j5duL9vkx0rH/mRK9Pp4=; b=edyUSCiHOE9AnHTxMgd6gPjkiK2mIYq5Ni0bkujSyKJQrr5ha65z1rbFm5vbbuFL8M 7rDBv50tjkFY9VZWX/bSq2adiEjSffZIQu4Frsf3rW3SIbaqzarL2Jciif79ExYhFCXn J9MgcjHzCfdadbzACpSOpi19domoM+MnUkZ9UJPdGGgGahUB0gg7U07kmkHhFyGZ60F9 8f+EK7Mau4ZCVBGRPRf5jcbqORzXD0dLvpcpY671b5aOek1J7R4nG7lQkstJ0d8RMzkL 8t+nmJedXwTs8F4aQy9TxwcgsOSU/hFil7vft+hEdIM+bw6qF0Rh9dMbWUxFq4NCkq0W fmYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=CqO+pUiMFFdyaLPwbkn+Cj2j5duL9vkx0rH/mRK9Pp4=; b=tlP/q/ALAvGfiYU/a8JqT52FlUpiJ7MUl6KiYGAd7D2ne8+nkYr9qNsXPACxf59t01 T61tMdJ9aacOcquD6f5842lvSigkP76QWzJIoKHrgjNjP5jU3I+kQ1f0gaV9zNSZDcRU SAgZc7qbQeO4uc3y4M3qffGZSq7zROMG84qNRk97i/81dlyBeyQ6f+hCqxli8eQCvTrF +D5AgzBGEcgdK4Fs3ZkIgtsHUSj7eXQq/mDoUkZLpbY+H2uUBNq9XPlKEvTcfobDMvCo n3WmXFmDIlU4lnBoQVyVqujOM/m0L6nr0BYbyi9HS6gZttIVrk+E5DhNVY1FCQ20ydtD v9nw== X-Gm-Message-State: AMCzsaUyu7V9/tDY12fp3NrfXZbaGMFxX44mtnmGFkTd3Ak54FghIdRX Tx5eFMAbC6gtTWZWR32kr73biA== X-Google-Smtp-Source: AOwi7QBIj9LqN6Dn6mGDYg5Wz72Ffeo2nhULoe+xpcTO53xeFq/aR2d1zhj1WFFzKwGEWxlF+D48Pw== X-Received: by 10.223.150.76 with SMTP id c12mr481864wra.10.1507746745933; Wed, 11 Oct 2017 11:32:25 -0700 (PDT) Received: from 6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id k126sm26555888wmd.1.2017.10.11.11.32.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Oct 2017 11:32:24 -0700 (PDT) From: Adrien Mazarguil To: Ferruh Yigit Cc: dev@dpdk.org, Matan Azrad , Ophir Munk , Moti Haimovsky Date: Wed, 11 Oct 2017 20:32:02 +0200 Message-Id: <07d25b88fec43497a90d77d03eaa14152a1d1762.1507746059.git.adrien.mazarguil@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: <1507195992-12513-1-git-send-email-ophirmu@mellanox.com> Subject: [dpdk-dev] [PATCH v5 5/5] net/mlx4: add loopback Tx from VF X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Moti Haimovsky This patch adds loopback functionality used when the chip is a VF in order to enable packet transmission between VFs and PF. Signed-off-by: Moti Haimovsky Acked-by: Adrien Mazarguil --- drivers/net/mlx4/mlx4_rxtx.c | 33 +++++++++++++++++++++------------ drivers/net/mlx4/mlx4_rxtx.h | 1 + drivers/net/mlx4/mlx4_txq.c | 2 ++ 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/drivers/net/mlx4/mlx4_rxtx.c b/drivers/net/mlx4/mlx4_rxtx.c index 87c5261..36173ad 100644 --- a/drivers/net/mlx4/mlx4_rxtx.c +++ b/drivers/net/mlx4/mlx4_rxtx.c @@ -311,10 +311,13 @@ mlx4_post_send(struct txq *txq, struct rte_mbuf *pkt) struct mlx4_wqe_data_seg *dseg; struct mlx4_sq *sq = &txq->msq; struct rte_mbuf *buf; + union { + uint32_t flags; + uint16_t flags16[2]; + } srcrb; uint32_t head_idx = sq->head & sq->txbb_cnt_mask; uint32_t lkey; uintptr_t addr; - uint32_t srcrb_flags; uint32_t owner_opcode = MLX4_OPCODE_SEND; uint32_t byte_count; int wqe_real_size; @@ -414,22 +417,16 @@ mlx4_post_send(struct txq *txq, struct rte_mbuf *pkt) /* Fill the control parameters for this packet. */ ctrl->fence_size = (wqe_real_size >> 4) & 0x3f; /* - * The caller should prepare "imm" in advance in order to support - * VF to VF communication (when the device is a virtual-function - * device (VF)). - */ - ctrl->imm = 0; - /* * For raw Ethernet, the SOLICIT flag is used to indicate that no ICRC * should be calculated. */ txq->elts_comp_cd -= nr_txbbs; if (unlikely(txq->elts_comp_cd <= 0)) { txq->elts_comp_cd = txq->elts_comp_cd_init; - srcrb_flags = RTE_BE32(MLX4_WQE_CTRL_SOLICIT | + srcrb.flags = RTE_BE32(MLX4_WQE_CTRL_SOLICIT | MLX4_WQE_CTRL_CQ_UPDATE); } else { - srcrb_flags = RTE_BE32(MLX4_WQE_CTRL_SOLICIT); + srcrb.flags = RTE_BE32(MLX4_WQE_CTRL_SOLICIT); } /* Enable HW checksum offload if requested */ if (txq->csum && @@ -443,14 +440,26 @@ mlx4_post_send(struct txq *txq, struct rte_mbuf *pkt) owner_opcode |= MLX4_WQE_CTRL_IIP_HDR_CSUM | MLX4_WQE_CTRL_IL4_HDR_CSUM; if (pkt->ol_flags & PKT_TX_OUTER_IP_CKSUM) - srcrb_flags |= + srcrb.flags |= RTE_BE32(MLX4_WQE_CTRL_IP_HDR_CSUM); } else { - srcrb_flags |= RTE_BE32(MLX4_WQE_CTRL_IP_HDR_CSUM | + srcrb.flags |= RTE_BE32(MLX4_WQE_CTRL_IP_HDR_CSUM | MLX4_WQE_CTRL_TCP_UDP_CSUM); } } - ctrl->srcrb_flags = srcrb_flags; + if (txq->lb) { + /* + * Copy destination MAC address to the WQE, this allows + * loopback in eSwitch, so that VFs and PF can communicate + * with each other. + */ + srcrb.flags16[0] = *(rte_pktmbuf_mtod(pkt, uint16_t *)); + ctrl->imm = *(rte_pktmbuf_mtod_offset(pkt, uint32_t *, + sizeof(uint16_t))); + } else { + ctrl->imm = 0; + } + ctrl->srcrb_flags = srcrb.flags; /* * Make sure descriptor is fully written before * setting ownership bit (because HW can start diff --git a/drivers/net/mlx4/mlx4_rxtx.h b/drivers/net/mlx4/mlx4_rxtx.h index 51af69c..e10bbca 100644 --- a/drivers/net/mlx4/mlx4_rxtx.h +++ b/drivers/net/mlx4/mlx4_rxtx.h @@ -128,6 +128,7 @@ struct txq { uint32_t max_inline; /**< Max inline send size. */ uint32_t csum:1; /**< Enable checksum offloading. */ uint32_t csum_l2tun:1; /**< Same for L2 tunnels. */ + uint32_t lb:1; /**< Whether packets should be looped back by eSwitch. */ uint8_t *bounce_buf; /**< Memory used for storing the first DWORD of data TXBBs. */ struct { diff --git a/drivers/net/mlx4/mlx4_txq.c b/drivers/net/mlx4/mlx4_txq.c index 41cdc4d..df4feb5 100644 --- a/drivers/net/mlx4/mlx4_txq.c +++ b/drivers/net/mlx4/mlx4_txq.c @@ -278,6 +278,8 @@ mlx4_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, RTE_MIN(MLX4_PMD_TX_PER_COMP_REQ, desc / 4), .csum = priv->hw_csum, .csum_l2tun = priv->hw_csum_l2tun, + /* Enable Tx loopback for VF devices. */ + .lb = !!priv->vf, .bounce_buf = bounce_buf, }; txq->cq = ibv_create_cq(priv->ctx, desc, NULL, NULL, 0);