Patch Detail

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

{
    "id": 41854,
    "url": "http://patches.dpdk.org/api/patches/41854/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20180628215235.106069-7-yong.liu@intel.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": "<20180628215235.106069-7-yong.liu@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20180628215235.106069-7-yong.liu@intel.com",
    "date": "2018-06-28T21:52:30",
    "name": "[v3,06/11] net/virtio: extract common part for in-order functions",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "68c01686bf5af4ad1526de6dfeab4725bafce78e",
    "submitter": {
        "id": 17,
        "url": "http://patches.dpdk.org/api/people/17/?format=api",
        "name": "Marvin Liu",
        "email": "yong.liu@intel.com"
    },
    "delegate": {
        "id": 2642,
        "url": "http://patches.dpdk.org/api/users/2642/?format=api",
        "username": "mcoquelin",
        "first_name": "Maxime",
        "last_name": "Coquelin",
        "email": "maxime.coquelin@redhat.com"
    },
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/20180628215235.106069-7-yong.liu@intel.com/mbox/",
    "series": [
        {
            "id": 296,
            "url": "http://patches.dpdk.org/api/series/296/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=296",
            "date": "2018-06-28T21:52:24",
            "name": "support in-order feature",
            "version": 3,
            "mbox": "http://patches.dpdk.org/series/296/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/41854/comments/",
    "check": "success",
    "checks": "http://patches.dpdk.org/api/patches/41854/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 115601B42A;\n\tThu, 28 Jun 2018 16:07:04 +0200 (CEST)",
            "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby dpdk.org (Postfix) with ESMTP id 296E11B293\n\tfor <dev@dpdk.org>; Thu, 28 Jun 2018 16:06:52 +0200 (CEST)",
            "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t28 Jun 2018 07:06:52 -0700",
            "from dpdk-test32.sh.intel.com ([10.67.119.193])\n\tby FMSMGA003.fm.intel.com with ESMTP; 28 Jun 2018 07:06:51 -0700"
        ],
        "X-Amp-Result": "SKIPPED(no attachment in message)",
        "X-Amp-File-Uploaded": "False",
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.51,283,1526367600\"; d=\"scan'208\";a=\"60850375\"",
        "From": "Marvin Liu <yong.liu@intel.com>",
        "To": "maxime.coquelin@redhat.com,\n\ttiwei.bie@intel.com",
        "Cc": "zhihong.wang@intel.com,\n\tdev@dpdk.org,\n\tMarvin Liu <yong.liu@intel.com>",
        "Date": "Fri, 29 Jun 2018 05:52:30 +0800",
        "Message-Id": "<20180628215235.106069-7-yong.liu@intel.com>",
        "X-Mailer": "git-send-email 2.17.0",
        "In-Reply-To": "<20180628215235.106069-1-yong.liu@intel.com>",
        "References": "<20180628215235.106069-1-yong.liu@intel.com>",
        "Subject": "[dpdk-dev] [PATCH v3 06/11] net/virtio: extract common part for\n\tin-order functions",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://mails.dpdk.org/archives/dev/>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "IN_ORDER virtio-user Tx function support Tx checksum offloading and\nTSO which also support on normal Tx function. So extracts common part\ninto separated function for reuse.\n\nSigned-off-by: Marvin Liu <yong.liu@intel.com>",
    "diff": "diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c\nindex 0bca29855..e9b1b496e 100644\n--- a/drivers/net/virtio/virtio_rxtx.c\n+++ b/drivers/net/virtio/virtio_rxtx.c\n@@ -246,6 +246,55 @@ tx_offload_enabled(struct virtio_hw *hw)\n \t\t(var) = (val);\t\t\t\\\n } while (0)\n \n+static inline void\n+virtqueue_xmit_offload(struct virtio_net_hdr *hdr,\n+\t\t\tstruct rte_mbuf *cookie,\n+\t\t\tint offload)\n+{\n+\tif (offload) {\n+\t\tif (cookie->ol_flags & PKT_TX_TCP_SEG)\n+\t\t\tcookie->ol_flags |= PKT_TX_TCP_CKSUM;\n+\n+\t\tswitch (cookie->ol_flags & PKT_TX_L4_MASK) {\n+\t\tcase PKT_TX_UDP_CKSUM:\n+\t\t\thdr->csum_start = cookie->l2_len + cookie->l3_len;\n+\t\t\thdr->csum_offset = offsetof(struct udp_hdr,\n+\t\t\t\tdgram_cksum);\n+\t\t\thdr->flags = VIRTIO_NET_HDR_F_NEEDS_CSUM;\n+\t\t\tbreak;\n+\n+\t\tcase PKT_TX_TCP_CKSUM:\n+\t\t\thdr->csum_start = cookie->l2_len + cookie->l3_len;\n+\t\t\thdr->csum_offset = offsetof(struct tcp_hdr, cksum);\n+\t\t\thdr->flags = VIRTIO_NET_HDR_F_NEEDS_CSUM;\n+\t\t\tbreak;\n+\n+\t\tdefault:\n+\t\t\tASSIGN_UNLESS_EQUAL(hdr->csum_start, 0);\n+\t\t\tASSIGN_UNLESS_EQUAL(hdr->csum_offset, 0);\n+\t\t\tASSIGN_UNLESS_EQUAL(hdr->flags, 0);\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\t/* TCP Segmentation Offload */\n+\t\tif (cookie->ol_flags & PKT_TX_TCP_SEG) {\n+\t\t\tvirtio_tso_fix_cksum(cookie);\n+\t\t\thdr->gso_type = (cookie->ol_flags & PKT_TX_IPV6) ?\n+\t\t\t\tVIRTIO_NET_HDR_GSO_TCPV6 :\n+\t\t\t\tVIRTIO_NET_HDR_GSO_TCPV4;\n+\t\t\thdr->gso_size = cookie->tso_segsz;\n+\t\t\thdr->hdr_len =\n+\t\t\t\tcookie->l2_len +\n+\t\t\t\tcookie->l3_len +\n+\t\t\t\tcookie->l4_len;\n+\t\t} else {\n+\t\t\tASSIGN_UNLESS_EQUAL(hdr->gso_type, 0);\n+\t\t\tASSIGN_UNLESS_EQUAL(hdr->gso_size, 0);\n+\t\t\tASSIGN_UNLESS_EQUAL(hdr->hdr_len, 0);\n+\t\t}\n+\t}\n+}\n+\n 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@@ -315,49 +364,7 @@ virtqueue_enqueue_xmit(struct virtnet_tx *txvq, struct rte_mbuf *cookie,\n \t\tidx = start_dp[idx].next;\n \t}\n \n-\t/* Checksum Offload / TSO */\n-\tif (offload) {\n-\t\tif (cookie->ol_flags & PKT_TX_TCP_SEG)\n-\t\t\tcookie->ol_flags |= PKT_TX_TCP_CKSUM;\n-\n-\t\tswitch (cookie->ol_flags & PKT_TX_L4_MASK) {\n-\t\tcase PKT_TX_UDP_CKSUM:\n-\t\t\thdr->csum_start = cookie->l2_len + cookie->l3_len;\n-\t\t\thdr->csum_offset = offsetof(struct udp_hdr,\n-\t\t\t\tdgram_cksum);\n-\t\t\thdr->flags = VIRTIO_NET_HDR_F_NEEDS_CSUM;\n-\t\t\tbreak;\n-\n-\t\tcase PKT_TX_TCP_CKSUM:\n-\t\t\thdr->csum_start = cookie->l2_len + cookie->l3_len;\n-\t\t\thdr->csum_offset = offsetof(struct tcp_hdr, cksum);\n-\t\t\thdr->flags = VIRTIO_NET_HDR_F_NEEDS_CSUM;\n-\t\t\tbreak;\n-\n-\t\tdefault:\n-\t\t\tASSIGN_UNLESS_EQUAL(hdr->csum_start, 0);\n-\t\t\tASSIGN_UNLESS_EQUAL(hdr->csum_offset, 0);\n-\t\t\tASSIGN_UNLESS_EQUAL(hdr->flags, 0);\n-\t\t\tbreak;\n-\t\t}\n-\n-\t\t/* TCP Segmentation Offload */\n-\t\tif (cookie->ol_flags & PKT_TX_TCP_SEG) {\n-\t\t\tvirtio_tso_fix_cksum(cookie);\n-\t\t\thdr->gso_type = (cookie->ol_flags & PKT_TX_IPV6) ?\n-\t\t\t\tVIRTIO_NET_HDR_GSO_TCPV6 :\n-\t\t\t\tVIRTIO_NET_HDR_GSO_TCPV4;\n-\t\t\thdr->gso_size = cookie->tso_segsz;\n-\t\t\thdr->hdr_len =\n-\t\t\t\tcookie->l2_len +\n-\t\t\t\tcookie->l3_len +\n-\t\t\t\tcookie->l4_len;\n-\t\t} else {\n-\t\t\tASSIGN_UNLESS_EQUAL(hdr->gso_type, 0);\n-\t\t\tASSIGN_UNLESS_EQUAL(hdr->gso_size, 0);\n-\t\t\tASSIGN_UNLESS_EQUAL(hdr->hdr_len, 0);\n-\t\t}\n-\t}\n+\tvirtqueue_xmit_offload(hdr, cookie, offload);\n \n \tdo {\n \t\tstart_dp[idx].addr  = VIRTIO_MBUF_DATA_DMA_ADDR(cookie, vq);\n@@ -621,6 +628,15 @@ virtio_update_packet_stats(struct virtnet_stats *stats, struct rte_mbuf *mbuf)\n \t}\n }\n \n+static inline void\n+virtio_rx_stats_updated(struct virtnet_rx *rxvq, struct rte_mbuf *m)\n+{\n+\tVIRTIO_DUMP_PACKET(m, m->data_len);\n+\n+\trxvq->stats.bytes += m->pkt_len;\n+\tvirtio_update_packet_stats(&rxvq->stats, m);\n+}\n+\n /* Optionally fill offload information in structure */\n static int\n virtio_rx_offload(struct rte_mbuf *m, struct virtio_net_hdr *hdr)\n@@ -773,12 +789,9 @@ virtio_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \t\t\tcontinue;\n \t\t}\n \n-\t\tVIRTIO_DUMP_PACKET(rxm, rxm->data_len);\n+\t\tvirtio_rx_stats_updated(rxvq, rxm);\n \n \t\trx_pkts[nb_rx++] = rxm;\n-\n-\t\trxvq->stats.bytes += rxm->pkt_len;\n-\t\tvirtio_update_packet_stats(&rxvq->stats, rxm);\n \t}\n \n \trxvq->stats.packets += nb_rx;\n",
    "prefixes": [
        "v3",
        "06/11"
    ]
}