Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/810034/?format=api
{ "id": 810034, "url": "http://patchwork.ozlabs.org/api/patches/810034/?format=api", "web_url": "http://patchwork.ozlabs.org/project/openvswitch/patch/1504603381-30071-3-git-send-email-yliu@fridaylinux.org/", "project": { "id": 47, "url": "http://patchwork.ozlabs.org/api/projects/47/?format=api", "name": "Open vSwitch", "link_name": "openvswitch", "list_id": "ovs-dev.openvswitch.org", "list_email": "ovs-dev@openvswitch.org", "web_url": "http://openvswitch.org/", "scm_url": "git@github.com:openvswitch/ovs.git", "webscm_url": "https://github.com/openvswitch/ovs", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1504603381-30071-3-git-send-email-yliu@fridaylinux.org>", "list_archive_url": null, "date": "2017-09-05T09:22:55", "name": "[ovs-dev,v2,2/8] dpif-netdev: retrieve flow directly from the flow mark", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "09040a7f62c293109f375cfe806c43f44777e5eb", "submitter": { "id": 72215, "url": "http://patchwork.ozlabs.org/api/people/72215/?format=api", "name": "Yuanhan Liu", "email": "yliu@fridaylinux.org" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/openvswitch/patch/1504603381-30071-3-git-send-email-yliu@fridaylinux.org/mbox/", "series": [ { "id": 1528, "url": "http://patchwork.ozlabs.org/api/series/1528/?format=api", "web_url": "http://patchwork.ozlabs.org/project/openvswitch/list/?series=1528", "date": "2017-09-05T09:22:53", "name": "OVS-DPDK flow offload with rte_flow", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/1528/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/810034/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/810034/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<ovs-dev-bounces@openvswitch.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "dev@openvswitch.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "ovs-dev@mail.linuxfoundation.org" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=openvswitch.org\n\t(client-ip=140.211.169.12; helo=mail.linuxfoundation.org;\n\tenvelope-from=ovs-dev-bounces@openvswitch.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=fridaylinux-org.20150623.gappssmtp.com\n\theader.i=@fridaylinux-org.20150623.gappssmtp.com\n\theader.b=\"t9SegZcW\"; dkim-atps=neutral" ], "Received": [ "from mail.linuxfoundation.org (mail.linuxfoundation.org\n\t[140.211.169.12])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xmhBf15BBz9sNr\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 5 Sep 2017 19:24:58 +1000 (AEST)", "from mail.linux-foundation.org (localhost [127.0.0.1])\n\tby mail.linuxfoundation.org (Postfix) with ESMTP id 09043AC8;\n\tTue, 5 Sep 2017 09:23:46 +0000 (UTC)", "from smtp1.linuxfoundation.org (smtp1.linux-foundation.org\n\t[172.17.192.35])\n\tby mail.linuxfoundation.org (Postfix) with ESMTPS id 4E621AB5\n\tfor <dev@openvswitch.org>; Tue, 5 Sep 2017 09:23:44 +0000 (UTC)", "from mail-pg0-f48.google.com (mail-pg0-f48.google.com\n\t[74.125.83.48])\n\tby smtp1.linuxfoundation.org (Postfix) with ESMTPS id CEA70E0\n\tfor <dev@openvswitch.org>; Tue, 5 Sep 2017 09:23:43 +0000 (UTC)", "by mail-pg0-f48.google.com with SMTP id j6so8140037pgc.1\n\tfor <dev@openvswitch.org>; Tue, 05 Sep 2017 02:23:43 -0700 (PDT)", "from localhost.localdomain ([101.228.204.163])\n\tby smtp.gmail.com with ESMTPSA id\n\ti187sm295921pfe.71.2017.09.05.02.23.40\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tTue, 05 Sep 2017 02:23:41 -0700 (PDT)" ], "X-Greylist": "whitelisted by SQLgrey-1.7.6", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=fridaylinux-org.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=1WU4S/nyLHgSpGcL0B15Gv75DPeVW0vNfKvnRxGmUNg=;\n\tb=t9SegZcW/O7+66IfZC7eky+dXTeIJz+gqEd1eDO4vC8dxT7Iw2sj2tQhPkxYFZEDyK\n\txVrm4ohyBYcoHR+ozBqOgu6xBdbgjxFczOQnYfnTejGhK7e1JBLDmX7rVRAfyu7Dhy6y\n\t1XOygLgEH01BnUQzv/HRgbfq11BdzXIQUJegRghPSXGkCwt4hw+3r+PfAXwBK9sInxP4\n\tnJEPoIp0SVmtaqAvSqYkOwYQTY8dGWRS5ntgBShGQZ3pA1ZeB4bcmKgXjV/iGRUEvSXU\n\tKFnZlm1nn8ZS8MTUVO53uklsAMXDP+ZAipBWkE0oeh9s+qOMyljfB3TaqwViRgqrzs7Y\n\tbD/g==", "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=1WU4S/nyLHgSpGcL0B15Gv75DPeVW0vNfKvnRxGmUNg=;\n\tb=AMo5g26dWbWzfklleDiVaS36bYfLwK9H8nBFh5KhXPm7vN/3LfA5b/PzzpmmC9BiXN\n\tL9HKDyy/EpNPxuBpgozbxmqLtYTTkeSDu36924NTcJbUVXcBZ3gsH7K8RXNF/MaLhGEw\n\tFzaGtkxfvW0Jr303ihZr7I1xevZ9gIxXuwX4Gx/W8Tlt9q2Za7kR3Nx2MZQmXu9/Q9kT\n\tGe+NyZyyzn2wqNe3LY+sIAgP41KTYssvgMD2k1EqwoWTmV+2G/NgygZpq7ksc3hbHh1V\n\tcMbfkj7mfS2Xx5p2zG/b8gu+Pk8AKuO2dwRNpKKt6XzBC5+FPg3nG5dDBs0hNkFuzDyw\n\t+kOQ==", "X-Gm-Message-State": "AHPjjUjYEcDkwxfdVnDDE0PvEZZ2TdM52U74oht4C2G3N+PHdwPqnP8G\n\tvCqBc5GONOHYTgTorJhpgA==", "X-Google-Smtp-Source": "ADKCNb5daE5EiuPtA1nrXg3kd8r9Wvvr4tkC7szAGHSgUErHhB9XUrWBiYKpTiZiFSunQQq4oxxjCw==", "X-Received": "by 10.98.245.8 with SMTP id n8mr3118036pfh.108.1504603422933;\n\tTue, 05 Sep 2017 02:23:42 -0700 (PDT)", "From": "Yuanhan Liu <yliu@fridaylinux.org>", "To": "dev@openvswitch.org", "Date": "Tue, 5 Sep 2017 17:22:55 +0800", "Message-Id": "<1504603381-30071-3-git-send-email-yliu@fridaylinux.org>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1504603381-30071-1-git-send-email-yliu@fridaylinux.org>", "References": "<1504603381-30071-1-git-send-email-yliu@fridaylinux.org>", "X-Spam-Status": "No, score=0.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,\n\tRCVD_IN_DNSWL_NONE autolearn=disabled version=3.3.1", "X-Spam-Checker-Version": "SpamAssassin 3.3.1 (2010-03-16) on\n\tsmtp1.linux-foundation.org", "Subject": "[ovs-dev] [PATCH v2 2/8] dpif-netdev: retrieve flow directly from\n\tthe flow mark", "X-BeenThere": "ovs-dev@openvswitch.org", "X-Mailman-Version": "2.1.12", "Precedence": "list", "List-Id": "<ovs-dev.openvswitch.org>", "List-Unsubscribe": "<https://mail.openvswitch.org/mailman/options/ovs-dev>,\n\t<mailto:ovs-dev-request@openvswitch.org?subject=unsubscribe>", "List-Archive": "<http://mail.openvswitch.org/pipermail/ovs-dev/>", "List-Post": "<mailto:ovs-dev@openvswitch.org>", "List-Help": "<mailto:ovs-dev-request@openvswitch.org?subject=help>", "List-Subscribe": "<https://mail.openvswitch.org/mailman/listinfo/ovs-dev>,\n\t<mailto:ovs-dev-request@openvswitch.org?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Sender": "ovs-dev-bounces@openvswitch.org", "Errors-To": "ovs-dev-bounces@openvswitch.org" }, "content": "So that we could skip the heavy emc processing, notably, the\nminiflow_extract function. A simple PHY-PHY forwarding testing\nshows 53% performance improvement.\n\nNote that though the heavy miniflow_extract is skipped, we\nstill have to do per packet checking, due to we have to check\nthe tcp_flags.\n\nCo-authored-by: Finn Christensen <fc@napatech.com>\nSigned-off-by: Yuanhan Liu <yliu@fridaylinux.org>\nSigned-off-by: Finn Christensen <fc@napatech.com>\n---\n\nv2: update tcp_flags, which also fixes the build warnings\n---\n lib/dp-packet.h | 13 ++++++++++\n lib/dpif-netdev.c | 27 ++++++++++++++-----\n lib/flow.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++\n lib/flow.h | 1 +\n 4 files changed, 113 insertions(+), 6 deletions(-)", "diff": "diff --git a/lib/dp-packet.h b/lib/dp-packet.h\nindex 046f3ab..a7a062f 100644\n--- a/lib/dp-packet.h\n+++ b/lib/dp-packet.h\n@@ -691,6 +691,19 @@ reset_dp_packet_checksum_ol_flags(struct dp_packet *p)\n #define reset_dp_packet_checksum_ol_flags(arg)\n #endif\n \n+static inline bool\n+dp_packet_has_flow_mark(struct dp_packet *p OVS_UNUSED,\n+ uint32_t *mark OVS_UNUSED)\n+{\n+#ifdef DPDK_NETDEV\n+ if (p->mbuf.ol_flags & PKT_RX_FDIR_ID) {\n+ *mark = p->mbuf.hash.fdir.hi;\n+ return true;\n+ }\n+#endif\n+ return false;\n+}\n+\n enum { NETDEV_MAX_BURST = 32 }; /* Maximum number packets in a batch. */\n \n struct dp_packet_batch {\ndiff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c\nindex f3b7f25..a95b8d4 100644\n--- a/lib/dpif-netdev.c\n+++ b/lib/dpif-netdev.c\n@@ -4883,10 +4883,10 @@ struct packet_batch_per_flow {\n static inline void\n packet_batch_per_flow_update(struct packet_batch_per_flow *batch,\n struct dp_packet *packet,\n- const struct miniflow *mf)\n+ uint16_t tcp_flags)\n {\n batch->byte_count += dp_packet_size(packet);\n- batch->tcp_flags |= miniflow_get_tcp_flags(mf);\n+ batch->tcp_flags |= tcp_flags;\n batch->array.packets[batch->array.count++] = packet;\n }\n \n@@ -4921,7 +4921,7 @@ packet_batch_per_flow_execute(struct packet_batch_per_flow *batch,\n \n static inline void\n dp_netdev_queue_batches(struct dp_packet *pkt,\n- struct dp_netdev_flow *flow, const struct miniflow *mf,\n+ struct dp_netdev_flow *flow, uint16_t tcp_flags,\n struct packet_batch_per_flow *batches,\n size_t *n_batches)\n {\n@@ -4932,7 +4932,7 @@ dp_netdev_queue_batches(struct dp_packet *pkt,\n packet_batch_per_flow_init(batch, flow);\n }\n \n- packet_batch_per_flow_update(batch, pkt, mf);\n+ packet_batch_per_flow_update(batch, pkt, tcp_flags);\n }\n \n /* Try to process all ('cnt') the 'packets' using only the exact match cache\n@@ -4960,11 +4960,13 @@ emc_processing(struct dp_netdev_pmd_thread *pmd,\n const size_t size = dp_packet_batch_size(packets_);\n uint32_t cur_min;\n int i;\n+ uint16_t tcp_flags;\n \n atomic_read_relaxed(&pmd->dp->emc_insert_min, &cur_min);\n \n DP_PACKET_BATCH_REFILL_FOR_EACH (i, size, packet, packets_) {\n struct dp_netdev_flow *flow;\n+ uint32_t flow_mark;\n \n if (OVS_UNLIKELY(dp_packet_size(packet) < ETH_HEADER_LEN)) {\n dp_packet_delete(packet);\n@@ -4972,6 +4974,16 @@ emc_processing(struct dp_netdev_pmd_thread *pmd,\n continue;\n }\n \n+ if (dp_packet_has_flow_mark(packet, &flow_mark)) {\n+ flow = dp_netdev_pmd_find_flow_by_mark(pmd, flow_mark);\n+ if (flow) {\n+ tcp_flags = parse_tcp_flags(packet);\n+ dp_netdev_queue_batches(packet, flow, tcp_flags, batches,\n+ n_batches);\n+ continue;\n+ }\n+ }\n+\n if (i != size - 1) {\n struct dp_packet **packets = packets_->packets;\n /* Prefetch next packet data and metadata. */\n@@ -4989,7 +5001,8 @@ emc_processing(struct dp_netdev_pmd_thread *pmd,\n /* If EMC is disabled skip emc_lookup */\n flow = (cur_min == 0) ? NULL: emc_lookup(flow_cache, key);\n if (OVS_LIKELY(flow)) {\n- dp_netdev_queue_batches(packet, flow, &key->mf, batches,\n+ tcp_flags = miniflow_get_tcp_flags(&key->mf);\n+ dp_netdev_queue_batches(packet, flow, tcp_flags, batches,\n n_batches);\n } else {\n /* Exact match cache missed. Group missed packets together at\n@@ -5166,7 +5179,9 @@ fast_path_processing(struct dp_netdev_pmd_thread *pmd,\n flow = dp_netdev_flow_cast(rules[i]);\n \n emc_probabilistic_insert(pmd, &keys[i], flow);\n- dp_netdev_queue_batches(packet, flow, &keys[i].mf, batches, n_batches);\n+ dp_netdev_queue_batches(packet, flow,\n+ miniflow_get_tcp_flags(&keys[i].mf),\n+ batches, n_batches);\n }\n \n dp_netdev_count_packet(pmd, DP_STAT_MASKED_HIT, cnt - miss_cnt);\ndiff --git a/lib/flow.c b/lib/flow.c\nindex b2b10aa..912c538 100644\n--- a/lib/flow.c\n+++ b/lib/flow.c\n@@ -991,6 +991,84 @@ parse_dl_type(const struct eth_header *data_, size_t size)\n return parse_ethertype(&data, &size);\n }\n \n+uint16_t\n+parse_tcp_flags(struct dp_packet *packet)\n+{\n+ const void *data = dp_packet_data(packet);\n+ size_t size = dp_packet_size(packet);\n+ ovs_be16 dl_type;\n+ uint8_t nw_frag = 0, nw_proto = 0;\n+\n+ if (packet->packet_type != htonl(PT_ETH)) {\n+ return 0;\n+ }\n+\n+ data_pull(&data, &size, ETH_ADDR_LEN * 2);\n+ dl_type = parse_ethertype(&data, &size);\n+ if (OVS_LIKELY(dl_type == htons(ETH_TYPE_IP))) {\n+ const struct ip_header *nh = data;\n+ int ip_len;\n+\n+ if (OVS_UNLIKELY(size < IP_HEADER_LEN)) {\n+ return 0;\n+ }\n+ ip_len = IP_IHL(nh->ip_ihl_ver) * 4;\n+\n+ if (OVS_UNLIKELY(ip_len < IP_HEADER_LEN)) {\n+ return 0;\n+ }\n+ if (OVS_UNLIKELY(size < ip_len)) {\n+ return 0;\n+ }\n+\n+ if (OVS_UNLIKELY(IP_IS_FRAGMENT(nh->ip_frag_off))) {\n+ nw_frag = FLOW_NW_FRAG_ANY;\n+ if (nh->ip_frag_off & htons(IP_FRAG_OFF_MASK)) {\n+ nw_frag |= FLOW_NW_FRAG_LATER;\n+ }\n+ }\n+ nw_proto = nh->ip_proto;\n+ data_pull(&data, &size, ip_len);\n+ } else if (dl_type == htons(ETH_TYPE_IPV6)) {\n+ const struct ovs_16aligned_ip6_hdr *nh;\n+ uint16_t plen;\n+\n+ if (OVS_UNLIKELY(size < sizeof *nh)) {\n+ return 0;\n+ }\n+ nh = data_pull(&data, &size, sizeof *nh);\n+\n+ plen = ntohs(nh->ip6_plen);\n+ if (OVS_UNLIKELY(plen > size)) {\n+ return 0;\n+ }\n+ /* Jumbo Payload option not supported yet. */\n+ if (OVS_UNLIKELY(size - plen > UINT8_MAX)) {\n+ return 0;\n+ }\n+ size = plen;\n+\n+ nw_proto = nh->ip6_nxt;\n+ if (!parse_ipv6_ext_hdrs__(&data, &size, &nw_proto, &nw_frag)) {\n+ return 0;\n+ }\n+ } else {\n+ return 0;\n+ }\n+\n+ if (OVS_LIKELY(!(nw_frag & FLOW_NW_FRAG_LATER))) {\n+ if (OVS_LIKELY(nw_proto == IPPROTO_TCP)) {\n+ if (OVS_LIKELY(size >= TCP_HEADER_LEN)) {\n+ const struct tcp_header *tcp = data;\n+\n+ return TCP_FLAGS_BE32(tcp->tcp_ctl);\n+ }\n+ }\n+ }\n+\n+ return 0;\n+}\n+\n /* For every bit of a field that is wildcarded in 'wildcards', sets the\n * corresponding bit in 'flow' to zero. */\n void\ndiff --git a/lib/flow.h b/lib/flow.h\nindex 6ae5a67..f113ec4 100644\n--- a/lib/flow.h\n+++ b/lib/flow.h\n@@ -130,6 +130,7 @@ bool parse_ipv6_ext_hdrs(const void **datap, size_t *sizep, uint8_t *nw_proto,\n uint8_t *nw_frag);\n ovs_be16 parse_dl_type(const struct eth_header *data_, size_t size);\n bool parse_nsh(const void **datap, size_t *sizep, struct flow_nsh *key);\n+uint16_t parse_tcp_flags(struct dp_packet *packet);\n \n static inline uint64_t\n flow_get_xreg(const struct flow *flow, int idx)\n", "prefixes": [ "ovs-dev", "v2", "2/8" ] }