Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 16353,
    "url": "http://patches.dpdk.org/api/patches/16353/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/1475485223-30566-11-git-send-email-olivier.matz@6wind.com/",
    "project": {
        "id": 1,
        "url": "http://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": "<1475485223-30566-11-git-send-email-olivier.matz@6wind.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1475485223-30566-11-git-send-email-olivier.matz@6wind.com",
    "date": "2016-10-03T09:00:21",
    "name": "[dpdk-dev,v2,10/12] virtio: add Tx checksum offload support",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "339ad4b5c8c139f5f72eb509dc569dea0c021f3e",
    "submitter": {
        "id": 8,
        "url": "http://patches.dpdk.org/api/people/8/?format=api",
        "name": "Olivier Matz",
        "email": "olivier.matz@6wind.com"
    },
    "delegate": {
        "id": 355,
        "url": "http://patches.dpdk.org/api/users/355/?format=api",
        "username": "yliu",
        "first_name": "Yuanhan",
        "last_name": "Liu",
        "email": "yuanhan.liu@linux.intel.com"
    },
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/1475485223-30566-11-git-send-email-olivier.matz@6wind.com/mbox/",
    "series": [],
    "comments": "http://patches.dpdk.org/api/patches/16353/comments/",
    "check": "pending",
    "checks": "http://patches.dpdk.org/api/patches/16353/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 [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id C8B8C8D8B;\n\tMon,  3 Oct 2016 11:01:19 +0200 (CEST)",
            "from proxy.6wind.com (host.76.145.23.62.rev.coltfrance.com\n\t[62.23.145.76]) by dpdk.org (Postfix) with ESMTP id CF16E6CC7\n\tfor <dev@dpdk.org>; Mon,  3 Oct 2016 11:00:59 +0200 (CEST)",
            "from glumotte.dev.6wind.com (unknown [10.16.0.195])\n\tby proxy.6wind.com (Postfix) with ESMTP id DC4DC2733C;\n\tMon,  3 Oct 2016 11:00:57 +0200 (CEST)"
        ],
        "From": "Olivier Matz <olivier.matz@6wind.com>",
        "To": "dev@dpdk.org,\n\tyuanhan.liu@linux.intel.com",
        "Cc": "konstantin.ananyev@intel.com, sugesh.chandran@intel.com,\n\tbruce.richardson@intel.com, jianfeng.tan@intel.com,\n\thelin.zhang@intel.com, \n\tadrien.mazarguil@6wind.com, stephen@networkplumber.org,\n\tdprovan@bivio.net, xiao.w.wang@intel.com",
        "Date": "Mon,  3 Oct 2016 11:00:21 +0200",
        "Message-Id": "<1475485223-30566-11-git-send-email-olivier.matz@6wind.com>",
        "X-Mailer": "git-send-email 2.8.1",
        "In-Reply-To": "<1475485223-30566-1-git-send-email-olivier.matz@6wind.com>",
        "References": "<1469088510-7552-1-git-send-email-olivier.matz@6wind.com>\n\t<1475485223-30566-1-git-send-email-olivier.matz@6wind.com>",
        "Subject": "[dpdk-dev] [PATCH v2 10/12] virtio: add Tx checksum offload support",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "patches and discussions about DPDK <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": "Signed-off-by: Olivier Matz <olivier.matz@6wind.com>\n---\n drivers/net/virtio/virtio_ethdev.c |  7 +++++\n drivers/net/virtio/virtio_ethdev.h |  1 +\n drivers/net/virtio/virtio_rxtx.c   | 57 +++++++++++++++++++++++++-------------\n 3 files changed, 45 insertions(+), 20 deletions(-)",
    "diff": "diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c\nindex 43cb096..55024cd 100644\n--- a/drivers/net/virtio/virtio_ethdev.c\n+++ b/drivers/net/virtio/virtio_ethdev.c\n@@ -1578,6 +1578,13 @@ virtio_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \tdev_info->rx_offload_capa =\n \t\tDEV_RX_OFFLOAD_TCP_CKSUM |\n \t\tDEV_RX_OFFLOAD_UDP_CKSUM;\n+\tdev_info->tx_offload_capa = 0;\n+\n+\tif (hw->guest_features & (1ULL << VIRTIO_NET_F_CSUM)) {\n+\t\tdev_info->tx_offload_capa |=\n+\t\t\tDEV_TX_OFFLOAD_UDP_CKSUM |\n+\t\t\tDEV_TX_OFFLOAD_TCP_CKSUM;\n+\t}\n }\n \n /*\ndiff --git a/drivers/net/virtio/virtio_ethdev.h b/drivers/net/virtio/virtio_ethdev.h\nindex 2fc9218..202aa2e 100644\n--- a/drivers/net/virtio/virtio_ethdev.h\n+++ b/drivers/net/virtio/virtio_ethdev.h\n@@ -62,6 +62,7 @@\n \t 1u << VIRTIO_NET_F_CTRL_VQ\t  |\t\\\n \t 1u << VIRTIO_NET_F_CTRL_RX\t  |\t\\\n \t 1u << VIRTIO_NET_F_CTRL_VLAN\t  |\t\\\n+\t 1u << VIRTIO_NET_F_CSUM\t  |\t\\\n \t 1u << VIRTIO_NET_F_MRG_RXBUF\t  |\t\\\n \t 1ULL << VIRTIO_F_VERSION_1)\n \ndiff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c\nindex eda678a..4ae11e7 100644\n--- a/drivers/net/virtio/virtio_rxtx.c\n+++ b/drivers/net/virtio/virtio_rxtx.c\n@@ -213,13 +213,14 @@ static inline void\n virtqueue_enqueue_xmit(struct virtnet_tx *txvq, struct rte_mbuf *cookie,\n \t\t       uint16_t needed, int use_indirect, int can_push)\n {\n+\tstruct virtio_tx_region *txr = txvq->virtio_net_hdr_mz->addr;\n \tstruct vq_desc_extra *dxp;\n \tstruct virtqueue *vq = txvq->vq;\n \tstruct vring_desc *start_dp;\n \tuint16_t seg_num = cookie->nb_segs;\n \tuint16_t head_idx, idx;\n \tuint16_t head_size = vq->hw->vtnet_hdr_size;\n-\tunsigned long offs;\n+\tstruct virtio_net_hdr *hdr;\n \n \thead_idx = vq->vq_desc_head_idx;\n \tidx = head_idx;\n@@ -230,10 +231,9 @@ virtqueue_enqueue_xmit(struct virtnet_tx *txvq, struct rte_mbuf *cookie,\n \tstart_dp = vq->vq_ring.desc;\n \n \tif (can_push) {\n-\t\t/* put on zero'd transmit header (no offloads) */\n-\t\tvoid *hdr = rte_pktmbuf_prepend(cookie, head_size);\n-\n-\t\tmemset(hdr, 0, head_size);\n+\t\t/* prepend cannot fail, checked by caller */\n+\t\thdr = (struct virtio_net_hdr *)\n+\t\t\trte_pktmbuf_prepend(cookie, head_size);\n \t} else if (use_indirect) {\n \t\t/* setup tx ring slot to point to indirect\n \t\t * descriptor list stored in reserved region.\n@@ -241,14 +241,11 @@ virtqueue_enqueue_xmit(struct virtnet_tx *txvq, struct rte_mbuf *cookie,\n \t\t * the first slot in indirect ring is already preset\n \t\t * to point to the header in reserved region\n \t\t */\n-\t\tstruct virtio_tx_region *txr = txvq->virtio_net_hdr_mz->addr;\n-\n-\t\toffs = idx * sizeof(struct virtio_tx_region)\n-\t\t\t+ offsetof(struct virtio_tx_region, tx_indir);\n-\n-\t\tstart_dp[idx].addr  = txvq->virtio_net_hdr_mem + offs;\n+\t\tstart_dp[idx].addr  = txvq->virtio_net_hdr_mem +\n+\t\t\tRTE_PTR_DIFF(&txr[idx].tx_indir, txr);\n \t\tstart_dp[idx].len   = (seg_num + 1) * sizeof(struct vring_desc);\n \t\tstart_dp[idx].flags = VRING_DESC_F_INDIRECT;\n+\t\thdr = (struct virtio_net_hdr *)&txr[idx].tx_hdr;\n \n \t\t/* loop below will fill in rest of the indirect elements */\n \t\tstart_dp = txr[idx].tx_indir;\n@@ -257,15 +254,40 @@ virtqueue_enqueue_xmit(struct virtnet_tx *txvq, struct rte_mbuf *cookie,\n \t\t/* setup first tx ring slot to point to header\n \t\t * stored in reserved region.\n \t\t */\n-\t\toffs = idx * sizeof(struct virtio_tx_region)\n-\t\t\t+ offsetof(struct virtio_tx_region, tx_hdr);\n-\n-\t\tstart_dp[idx].addr  = txvq->virtio_net_hdr_mem + offs;\n+\t\tstart_dp[idx].addr  = txvq->virtio_net_hdr_mem +\n+\t\t\tRTE_PTR_DIFF(&txr[idx].tx_hdr, txr);\n \t\tstart_dp[idx].len   = vq->hw->vtnet_hdr_size;\n \t\tstart_dp[idx].flags = VRING_DESC_F_NEXT;\n+\t\thdr = (struct virtio_net_hdr *)&txr[idx].tx_hdr;\n+\n \t\tidx = start_dp[idx].next;\n \t}\n \n+\t/* Checksum Offload */\n+\tswitch (cookie->ol_flags & PKT_TX_L4_MASK) {\n+\tcase PKT_TX_UDP_CKSUM:\n+\t\thdr->csum_start = cookie->l2_len + cookie->l3_len;\n+\t\thdr->csum_offset = 6;\n+\t\thdr->flags = VIRTIO_NET_HDR_F_NEEDS_CSUM;\n+\t\tbreak;\n+\n+\tcase PKT_TX_TCP_CKSUM:\n+\t\thdr->csum_start = cookie->l2_len + cookie->l3_len;\n+\t\thdr->csum_offset = 16;\n+\t\thdr->flags = VIRTIO_NET_HDR_F_NEEDS_CSUM;\n+\t\tbreak;\n+\n+\tdefault:\n+\t\thdr->csum_start = 0;\n+\t\thdr->csum_offset = 0;\n+\t\thdr->flags = 0;\n+\t\tbreak;\n+\t}\n+\n+\thdr->gso_type = 0;\n+\thdr->gso_size = 0;\n+\thdr->hdr_len = 0;\n+\n \tdo {\n \t\tstart_dp[idx].addr  = VIRTIO_MBUF_DATA_DMA_ADDR(cookie, vq);\n \t\tstart_dp[idx].len   = cookie->data_len;\n@@ -512,11 +534,6 @@ virtio_dev_tx_queue_setup(struct rte_eth_dev *dev,\n \n \tPMD_INIT_FUNC_TRACE();\n \n-\tif ((tx_conf->txq_flags & ETH_TXQ_FLAGS_NOXSUMS)\n-\t    != ETH_TXQ_FLAGS_NOXSUMS) {\n-\t\tPMD_INIT_LOG(ERR, \"TX checksum offload not supported\\n\");\n-\t\treturn -EINVAL;\n-\t}\n \n #ifdef RTE_MACHINE_CPUFLAG_SSSE3\n \t/* Use simple rx/tx func if single segment and no offloads */\n",
    "prefixes": [
        "dpdk-dev",
        "v2",
        "10/12"
    ]
}