Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/29619/?format=api
{ "id": 29619, "url": "https://patches.dpdk.org/api/patches/29619/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/3327a0e35529a430e5244a78be675ef7022e5e9c.1507141616.git.adrien.mazarguil@6wind.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<3327a0e35529a430e5244a78be675ef7022e5e9c.1507141616.git.adrien.mazarguil@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/3327a0e35529a430e5244a78be675ef7022e5e9c.1507141616.git.adrien.mazarguil@6wind.com", "date": "2017-10-04T18:48:58", "name": "[dpdk-dev,v3,6/6] net/mlx4: add loopback Tx from VF", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "dd525adda127b612b4206fe29580e19ba8b34637", "submitter": { "id": 165, "url": "https://patches.dpdk.org/api/people/165/?format=api", "name": "Adrien Mazarguil", "email": "adrien.mazarguil@6wind.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/3327a0e35529a430e5244a78be675ef7022e5e9c.1507141616.git.adrien.mazarguil@6wind.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/29619/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/29619/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 836AF1B6FD;\n\tWed, 4 Oct 2017 20:49:30 +0200 (CEST)", "from mail-wm0-f41.google.com (mail-wm0-f41.google.com\n\t[74.125.82.41]) by dpdk.org (Postfix) with ESMTP id C58E61B6DF\n\tfor <dev@dpdk.org>; Wed, 4 Oct 2017 20:49:23 +0200 (CEST)", "by mail-wm0-f41.google.com with SMTP id i124so24982418wmf.3\n\tfor <dev@dpdk.org>; Wed, 04 Oct 2017 11:49:23 -0700 (PDT)", "from 6wind.com (host.78.145.23.62.rev.coltfrance.com.\n\t[62.23.145.78]) by smtp.gmail.com with ESMTPSA id\n\tp45sm8483367edc.30.2017.10.04.11.49.22\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 04 Oct 2017 11:49:22 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=6wind-com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=Vst3bLdekAlIxg5wo61Jb06Q/OUzopSPXMZwH5Yzdcw=;\n\tb=T522g5BFQb4t1qIFPGiks3mxlt9hWExQaHWswHv0HIDEmzMiiV6lVWMKtUh7kdotZ0\n\tKYAHq7MIbVzTy93/VkFVXOUbBFOjKRr7ZdginzQ+CqxnAuADEC9RQXc3955y7+/uRvDi\n\tGrEAb/RQPPMAZ0oVayPiPctfREjytPBEzsGNgOcECRRdP4lQBByry9tAOVPM77xMh0do\n\tUlUAIz+pdPE3ZJ63y7hkwo6p6/pya95bJduKgkoiBMcxaNuTn5uXxG7RrkIR39+WcZf3\n\tb1EfqlVaiSI+amksuRlnnvvYvmtQn6df31OtUYG9fqQvgWdBZ4ubcda2nh+jm2/zx/fG\n\tW35Q==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=Vst3bLdekAlIxg5wo61Jb06Q/OUzopSPXMZwH5Yzdcw=;\n\tb=r0/PkyTXVSzoSxJD7xPQU2GzihMDUr6QzHIcDEDejAf+IOjBlJWaCrLRl6sUwfKZQh\n\t7UNiax0UPOrVQ4MPhE0RpbQg3VOVkS++2LhZGa1fFW+DRVuAkoQSgtCzYyGcw+eIElQf\n\tsBs0KGNqOhwFQCEnY1C/Fme9Dwg8u5n8BvwqLIFesk3HHURl+QroA8xJl+Ne+j6grmhI\n\tgPrJwgb0FXwVeZCRwpDh2dRI/keTS73G7GIatVg0s3PPGJwPaTmla9DudCXKla2lc4uh\n\tg5fwhsn98hAOjfRjoxpanFtlZ/A/O+ZmcGATjPr1uMAB9a91hvlBG6ZbipPwwWbfcLYe\n\t1niA==", "X-Gm-Message-State": "AMCzsaVk/Mxoq7vz+b6pyVrCk5Utf7p1JrWRrQK6+rep6qxAmBeSFhQ+\n\tLjoHqJYRVNjggJIXJy+r8NE0eMQR", "X-Google-Smtp-Source": "AOwi7QC1cu5TyU79mhW+zkHb9GlFtM1F+WPFZSuFcY77LAVokNiSS3LbqE5tXkKFdz2fzIjeDfd5/Q==", "X-Received": "by 10.80.182.146 with SMTP id d18mr3175326ede.131.1507142963283; \n\tWed, 04 Oct 2017 11:49:23 -0700 (PDT)", "From": "Adrien Mazarguil <adrien.mazarguil@6wind.com>", "To": "dev@dpdk.org", "Cc": "Moti Haimovsky <motih@mellanox.com>,\n\tMatan Azrad <matan@mellanox.com>", "Date": "Wed, 4 Oct 2017 20:48:58 +0200", "Message-Id": "<3327a0e35529a430e5244a78be675ef7022e5e9c.1507141616.git.adrien.mazarguil@6wind.com>", "X-Mailer": "git-send-email 2.1.4", "In-Reply-To": "<cover.1507141616.git.adrien.mazarguil@6wind.com>", "References": "<1507027711-879-1-git-send-email-matan@mellanox.com>\n\t<cover.1507141616.git.adrien.mazarguil@6wind.com>", "Subject": "[dpdk-dev] [PATCH v3 6/6] 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 <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Moti Haimovsky <motih@mellanox.com>\n\nThis patch adds loopback functionality used when the chip is a VF in order\nto enable packet transmission between VFs and PF.\n\nSigned-off-by: Moti Haimovsky <motih@mellanox.com>\nAcked-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>\n---\n drivers/net/mlx4/mlx4_rxtx.c | 33 +++++++++++++++++++++------------\n drivers/net/mlx4/mlx4_rxtx.h | 1 +\n drivers/net/mlx4/mlx4_txq.c | 2 ++\n 3 files changed, 24 insertions(+), 12 deletions(-)", "diff": "diff --git a/drivers/net/mlx4/mlx4_rxtx.c b/drivers/net/mlx4/mlx4_rxtx.c\nindex 87c5261..36173ad 100644\n--- a/drivers/net/mlx4/mlx4_rxtx.c\n+++ b/drivers/net/mlx4/mlx4_rxtx.c\n@@ -311,10 +311,13 @@ mlx4_post_send(struct txq *txq, struct rte_mbuf *pkt)\n \tstruct mlx4_wqe_data_seg *dseg;\n \tstruct mlx4_sq *sq = &txq->msq;\n \tstruct rte_mbuf *buf;\n+\tunion {\n+\t\tuint32_t flags;\n+\t\tuint16_t flags16[2];\n+\t} srcrb;\n \tuint32_t head_idx = sq->head & sq->txbb_cnt_mask;\n \tuint32_t lkey;\n \tuintptr_t addr;\n-\tuint32_t srcrb_flags;\n \tuint32_t owner_opcode = MLX4_OPCODE_SEND;\n \tuint32_t byte_count;\n \tint wqe_real_size;\n@@ -414,22 +417,16 @@ mlx4_post_send(struct txq *txq, struct rte_mbuf *pkt)\n \t/* Fill the control parameters for this packet. */\n \tctrl->fence_size = (wqe_real_size >> 4) & 0x3f;\n \t/*\n-\t * The caller should prepare \"imm\" in advance in order to support\n-\t * VF to VF communication (when the device is a virtual-function\n-\t * device (VF)).\n-\t */\n-\tctrl->imm = 0;\n-\t/*\n \t * For raw Ethernet, the SOLICIT flag is used to indicate that no ICRC\n \t * should be calculated.\n \t */\n \ttxq->elts_comp_cd -= nr_txbbs;\n \tif (unlikely(txq->elts_comp_cd <= 0)) {\n \t\ttxq->elts_comp_cd = txq->elts_comp_cd_init;\n-\t\tsrcrb_flags = RTE_BE32(MLX4_WQE_CTRL_SOLICIT |\n+\t\tsrcrb.flags = RTE_BE32(MLX4_WQE_CTRL_SOLICIT |\n \t\t\t\t MLX4_WQE_CTRL_CQ_UPDATE);\n \t} else {\n-\t\tsrcrb_flags = RTE_BE32(MLX4_WQE_CTRL_SOLICIT);\n+\t\tsrcrb.flags = RTE_BE32(MLX4_WQE_CTRL_SOLICIT);\n \t}\n \t/* Enable HW checksum offload if requested */\n \tif (txq->csum &&\n@@ -443,14 +440,26 @@ mlx4_post_send(struct txq *txq, struct rte_mbuf *pkt)\n \t\t\towner_opcode |= MLX4_WQE_CTRL_IIP_HDR_CSUM |\n \t\t\t\t\tMLX4_WQE_CTRL_IL4_HDR_CSUM;\n \t\t\tif (pkt->ol_flags & PKT_TX_OUTER_IP_CKSUM)\n-\t\t\t\tsrcrb_flags |=\n+\t\t\t\tsrcrb.flags |=\n \t\t\t\t\tRTE_BE32(MLX4_WQE_CTRL_IP_HDR_CSUM);\n \t\t} else {\n-\t\t\tsrcrb_flags |= RTE_BE32(MLX4_WQE_CTRL_IP_HDR_CSUM |\n+\t\t\tsrcrb.flags |= RTE_BE32(MLX4_WQE_CTRL_IP_HDR_CSUM |\n \t\t\t\t\t\tMLX4_WQE_CTRL_TCP_UDP_CSUM);\n \t\t}\n \t}\n-\tctrl->srcrb_flags = srcrb_flags;\n+\tif (txq->lb) {\n+\t\t/*\n+\t\t * Copy destination MAC address to the WQE, this allows\n+\t\t * loopback in eSwitch, so that VFs and PF can communicate\n+\t\t * with each other.\n+\t\t */\n+\t\tsrcrb.flags16[0] = *(rte_pktmbuf_mtod(pkt, uint16_t *));\n+\t\tctrl->imm = *(rte_pktmbuf_mtod_offset(pkt, uint32_t *,\n+\t\t\t\t\t\t sizeof(uint16_t)));\n+\t} else {\n+\t\tctrl->imm = 0;\n+\t}\n+\tctrl->srcrb_flags = srcrb.flags;\n \t/*\n \t * Make sure descriptor is fully written before\n \t * setting ownership bit (because HW can start\ndiff --git a/drivers/net/mlx4/mlx4_rxtx.h b/drivers/net/mlx4/mlx4_rxtx.h\nindex 6aad41a..37f31f4 100644\n--- a/drivers/net/mlx4/mlx4_rxtx.h\n+++ b/drivers/net/mlx4/mlx4_rxtx.h\n@@ -112,6 +112,7 @@ struct txq {\n \tuint32_t max_inline; /**< Max inline send size. */\n \tuint32_t csum:1; /**< Enable checksum offloading. */\n \tuint32_t csum_l2tun:1; /**< Same for L2 tunnels. */\n+\tuint32_t lb:1; /**< Whether packets should be looped back by eSwitch. */\n \tuint8_t *bounce_buf;\n \t/**< Memory used for storing the first DWORD of data TXBBs. */\n \tstruct {\ndiff --git a/drivers/net/mlx4/mlx4_txq.c b/drivers/net/mlx4/mlx4_txq.c\nindex 96429bc..9d1be95 100644\n--- a/drivers/net/mlx4/mlx4_txq.c\n+++ b/drivers/net/mlx4/mlx4_txq.c\n@@ -412,6 +412,8 @@ mlx4_txq_setup(struct rte_eth_dev *dev, struct txq *txq, uint16_t desc,\n \t\t (void *)dev, strerror(rte_errno));\n \t\tgoto error;\n \t}\n+\t/* Enable Tx loopback for VF devices. */\n+\ttmpl.lb = !!(priv->vf);\n \t/* Clean up txq in case we're reinitializing it. */\n \tDEBUG(\"%p: cleaning-up old txq just in case\", (void *)txq);\n \tmlx4_txq_cleanup(txq);\n", "prefixes": [ "dpdk-dev", "v3", "6/6" ] }