{"id":810033,"url":"http://patchwork.ozlabs.org/api/patches/810033/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/patch/1504603381-30071-2-git-send-email-yliu@fridaylinux.org/","project":{"id":47,"url":"http://patchwork.ozlabs.org/api/projects/47/?format=json","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-2-git-send-email-yliu@fridaylinux.org>","list_archive_url":null,"date":"2017-09-05T09:22:54","name":"[ovs-dev,v2,1/8] dpif-netdev: associate flow with a mark id","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"91e79375aefb2dcce9f60819b3dd12ced9abb26a","submitter":{"id":72215,"url":"http://patchwork.ozlabs.org/api/people/72215/?format=json","name":"Yuanhan Liu","email":"yliu@fridaylinux.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/openvswitch/patch/1504603381-30071-2-git-send-email-yliu@fridaylinux.org/mbox/","series":[{"id":1528,"url":"http://patchwork.ozlabs.org/api/series/1528/?format=json","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/810033/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810033/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=)","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=\"E5X0YseA\"; 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 3xmh9t532Hz9sNr\n\tfor ;\n\tTue, 5 Sep 2017 19:24:18 +1000 (AEST)","from mail.linux-foundation.org (localhost [127.0.0.1])\n\tby mail.linuxfoundation.org (Postfix) with ESMTP id 3A4E0AB6;\n\tTue, 5 Sep 2017 09:23:43 +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 D1A97AA5\n\tfor ; Tue, 5 Sep 2017 09:23:41 +0000 (UTC)","from mail-pf0-f176.google.com (mail-pf0-f176.google.com\n\t[209.85.192.176])\n\tby smtp1.linuxfoundation.org (Postfix) with ESMTPS id 329F2E0\n\tfor ; Tue, 5 Sep 2017 09:23:41 +0000 (UTC)","by mail-pf0-f176.google.com with SMTP id e199so6619509pfh.3\n\tfor ; Tue, 05 Sep 2017 02:23:41 -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.37\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tTue, 05 Sep 2017 02:23:38 -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=aUB2EbF2hZsRT67zmjtuXErHqmQ9VuxCjQCjJdy+nic=;\n\tb=E5X0YseAo1Ags7fQ65OOxcAPwYdnDMpg7Iq6KMbk+xiaOHTPfFQd3dPBhEGMqvJXR/\n\tODy0tkkjuoe4CLLAcgzMDf9lIKNCO8ZmJlDUNi1hx6MSL7EXldYk36kMpSnXhMs5MR2Q\n\t+BmzuY7bdOo/TIYwFeW4Wq6cGA52S6G487UISQ0XVUXa/oRIu8y3xXo9mO6urPD4K9yZ\n\t3PtzuM8EYMTNVmjWZEU9iNw7aTGz13oCa8F7ovZzgbttTchheSQl1qJNJswWYPRhkh7H\n\t/Wk91aqlIdg9y0PkHCWe1i91SQOgfT78tgXmtpza76PJltpqaTpsMxCqS6GuT9m1iQlu\n\tWcXg==","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=aUB2EbF2hZsRT67zmjtuXErHqmQ9VuxCjQCjJdy+nic=;\n\tb=tiSCE5aiqdSwpc8HM7Wn3QHm9EVsEhjSNisEH69oxsAjGCFj78Kk80jbMzM3ELTk4R\n\t9RHVwgHjMveG07WvMsoPleD97/J+PsgAclYpKpXUFIxxntCqw8CzcyRMc6AJDaIBqTDs\n\tX++Rg5F0lI9hKJopRxGyuAszatxOy9E+WPj9StratmzE7JfNiA7C10C2Ftay6u1POfhL\n\t0E/K4l01B5nsimMje77eykPRt4VqE4RBJAQsYOloXfYBIE3UYv/kjXTv5Ybs/QmGKEey\n\tcF/vhUBF8kJjvkRvLfUBDD1UOa7wPGOfQYqhrBWGVE5j/l53SLBtr6r3GzOHCK7GXDL8\n\tzI0w==","X-Gm-Message-State":"AHPjjUjUsmAj4K2nC0BlslI+3gw+chcVWjsMBJTN8ozvGaJjZatcuRTX\n\tIqTx2y0zjbqcDvMNXohCjg==","X-Google-Smtp-Source":"ADKCNb6z1o0axcTKttq6u32DubIP1TTcweNlCtPUdh59Z+XDlo7rPDJHssO3o1ZEqHtXfWkydFM3kQ==","X-Received":"by 10.98.155.139 with SMTP id e11mr3165927pfk.290.1504603420327; \n\tTue, 05 Sep 2017 02:23:40 -0700 (PDT)","From":"Yuanhan Liu ","To":"dev@openvswitch.org","Date":"Tue, 5 Sep 2017 17:22:54 +0800","Message-Id":"<1504603381-30071-2-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 1/8] dpif-netdev: associate flow with a mark id","X-BeenThere":"ovs-dev@openvswitch.org","X-Mailman-Version":"2.1.12","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","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":"This patch associate a flow with a mark id (a uint32_t number) by CMAP.\n\nIt re-uses the flow API (more precisely, the ->flow_put method) to setup\nthe hw flow. The flow_put implementation then is supposed to create a\nflow with MARK action.\n\nCo-authored-by: Finn Christensen \nSigned-off-by: Yuanhan Liu \nSigned-off-by: Finn Christensen \n---\n lib/dpif-netdev.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++\n lib/netdev.h | 6 ++++\n 2 files changed, 91 insertions(+)","diff":"diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c\nindex 071ec14..f3b7f25 100644\n--- a/lib/dpif-netdev.c\n+++ b/lib/dpif-netdev.c\n@@ -446,6 +446,12 @@ struct dp_netdev_flow {\n const unsigned pmd_id; /* The 'core_id' of pmd thread owning this */\n /* flow. */\n \n+ const struct cmap_node mark_node; /* In owning dp_netdev_pmd_thread's */\n+ /* 'mark_to_flow' */\n+ bool has_mark; /* A flag to tell whether this flow has a\n+ valid mark asscoiated with it. */\n+ uint32_t mark; /* Unique flow mark assiged to a flow */\n+\n /* Number of references.\n * The classifier owns one reference.\n * Any thread trying to keep a rule from being freed should hold its own\n@@ -569,6 +575,8 @@ struct dp_netdev_pmd_thread {\n struct ovs_mutex flow_mutex;\n struct cmap flow_table OVS_GUARDED; /* Flow table. */\n \n+ struct cmap mark_to_flow;\n+\n /* One classifier per in_port polled by the pmd */\n struct cmap classifiers;\n /* Periodically sort subtable vectors according to hit frequencies */\n@@ -1839,6 +1847,8 @@ dp_netdev_pmd_remove_flow(struct dp_netdev_pmd_thread *pmd,\n OVS_REQUIRES(pmd->flow_mutex)\n {\n struct cmap_node *node = CONST_CAST(struct cmap_node *, &flow->node);\n+ struct cmap_node *mark_node = CONST_CAST(struct cmap_node *,\n+ &flow->mark_node);\n struct dpcls *cls;\n odp_port_t in_port = flow->flow.in_port.odp_port;\n \n@@ -1846,6 +1856,10 @@ dp_netdev_pmd_remove_flow(struct dp_netdev_pmd_thread *pmd,\n ovs_assert(cls != NULL);\n dpcls_remove(cls, &flow->cr);\n cmap_remove(&pmd->flow_table, node, dp_netdev_flow_hash(&flow->ufid));\n+ if (flow->has_mark) {\n+ cmap_remove(&pmd->mark_to_flow, mark_node, flow->mark);\n+ flow->has_mark = false;\n+ }\n flow->dead = true;\n \n dp_netdev_flow_unref(flow);\n@@ -2235,6 +2249,38 @@ dp_netdev_pmd_find_flow(const struct dp_netdev_pmd_thread *pmd,\n return NULL;\n }\n \n+static struct dp_netdev_flow *\n+dp_netdev_pmd_find_flow_by_mark(const struct dp_netdev_pmd_thread *pmd,\n+ const uint32_t mark)\n+{\n+ struct dp_netdev_flow *netdev_flow;\n+\n+ CMAP_FOR_EACH_WITH_HASH (netdev_flow, mark_node, mark,\n+ &pmd->mark_to_flow) {\n+ if (netdev_flow->has_mark && netdev_flow->mark == mark) {\n+ return netdev_flow;\n+ }\n+ }\n+\n+ return NULL;\n+}\n+\n+static bool\n+dp_netdev_alloc_flow_mark(const struct dp_netdev_pmd_thread *pmd,\n+ uint32_t *mark)\n+{\n+ uint32_t i;\n+\n+ for (i = 0; i < UINT32_MAX; i++) {\n+ if (!dp_netdev_pmd_find_flow_by_mark(pmd, i)) {\n+ *mark = i;\n+ return true;\n+ }\n+ }\n+\n+ return false;\n+}\n+\n static void\n get_dpif_flow_stats(const struct dp_netdev_flow *netdev_flow_,\n struct dpif_flow_stats *stats)\n@@ -2434,6 +2480,7 @@ dp_netdev_flow_add(struct dp_netdev_pmd_thread *pmd,\n struct dp_netdev_flow *flow;\n struct netdev_flow_key mask;\n struct dpcls *cls;\n+ struct offload_info info;\n \n /* Make sure in_port is exact matched before we read it. */\n ovs_assert(match->wc.masks.in_port.odp_port == ODPP_NONE);\n@@ -2460,6 +2507,7 @@ dp_netdev_flow_add(struct dp_netdev_pmd_thread *pmd,\n memset(&flow->stats, 0, sizeof flow->stats);\n flow->dead = false;\n flow->batch = NULL;\n+ flow->has_mark = false;\n *CONST_CAST(unsigned *, &flow->pmd_id) = pmd->core_id;\n *CONST_CAST(struct flow *, &flow->flow) = match->flow;\n *CONST_CAST(ovs_u128 *, &flow->ufid) = *ufid;\n@@ -2475,6 +2523,22 @@ dp_netdev_flow_add(struct dp_netdev_pmd_thread *pmd,\n cmap_insert(&pmd->flow_table, CONST_CAST(struct cmap_node *, &flow->node),\n dp_netdev_flow_hash(&flow->ufid));\n \n+ if (netdev_is_flow_api_enabled() &&\n+ dp_netdev_alloc_flow_mark(pmd, &info.flow_mark)) {\n+ struct dp_netdev_port *port;\n+ port = dp_netdev_lookup_port(pmd->dp, in_port);\n+ if (netdev_flow_put(port->netdev, match,\n+ CONST_CAST(struct nlattr *, actions),\n+ actions_len, ufid, &info, NULL) == 0) {\n+ flow->has_mark = true;\n+ flow->mark = info.flow_mark;\n+ cmap_insert(&pmd->mark_to_flow,\n+ CONST_CAST(struct cmap_node *, &flow->mark_node),\n+ info.flow_mark);\n+ VLOG_INFO(\"installed flow %p with mark %u\\n\", flow, flow->mark);\n+ }\n+ }\n+\n if (OVS_UNLIKELY(!VLOG_DROP_DBG((&upcall_rl)))) {\n struct ds ds = DS_EMPTY_INITIALIZER;\n struct ofpbuf key_buf, mask_buf;\n@@ -2562,6 +2626,25 @@ flow_put_on_pmd(struct dp_netdev_pmd_thread *pmd,\n old_actions = dp_netdev_flow_get_actions(netdev_flow);\n ovsrcu_set(&netdev_flow->actions, new_actions);\n \n+ if (netdev_flow->has_mark) {\n+ struct offload_info info;\n+ struct dp_netdev_port *port;\n+ odp_port_t in_port;\n+ int ret;\n+\n+ in_port = netdev_flow->flow.in_port.odp_port;\n+ port = dp_netdev_lookup_port(pmd->dp, in_port);\n+ info.flow_mark = netdev_flow->mark;\n+ ret = netdev_flow_put(port->netdev, match,\n+ CONST_CAST(struct nlattr *,\n+ put->actions),\n+ put->actions_len, ufid, &info, stats);\n+\n+ VLOG_INFO(\"%s to modify flow %p associated with mark %u\\n\",\n+ ret == 0 ? \"succeed\" : \"failed\",\n+ netdev_flow, netdev_flow->mark);\n+ }\n+\n if (stats) {\n get_dpif_flow_stats(netdev_flow, stats);\n }\n@@ -4504,6 +4587,7 @@ dp_netdev_configure_pmd(struct dp_netdev_pmd_thread *pmd, struct dp_netdev *dp,\n ovs_mutex_init(&pmd->flow_mutex);\n ovs_mutex_init(&pmd->port_mutex);\n cmap_init(&pmd->flow_table);\n+ cmap_init(&pmd->mark_to_flow);\n cmap_init(&pmd->classifiers);\n pmd->next_optimization = time_msec() + DPCLS_OPTIMIZATION_INTERVAL;\n pmd->rxq_interval = time_msec() + PMD_RXQ_INTERVAL_LEN;\n@@ -4538,6 +4622,7 @@ dp_netdev_destroy_pmd(struct dp_netdev_pmd_thread *pmd)\n }\n cmap_destroy(&pmd->classifiers);\n cmap_destroy(&pmd->flow_table);\n+ cmap_destroy(&pmd->mark_to_flow);\n ovs_mutex_destroy(&pmd->flow_mutex);\n latch_destroy(&pmd->exit_latch);\n seq_destroy(pmd->reload_seq);\ndiff --git a/lib/netdev.h b/lib/netdev.h\nindex f8482f7..2003165 100644\n--- a/lib/netdev.h\n+++ b/lib/netdev.h\n@@ -188,6 +188,12 @@ void netdev_send_wait(struct netdev *, int qid);\n struct offload_info {\n const struct dpif_class *dpif_class;\n ovs_be16 tp_dst_port; /* Destination port for tunnel in SET action */\n+\n+ /*\n+ * The flow mark id assigened to the flow. If any pkts hit the flow,\n+ * it will be in the pkt meta data.\n+ */\n+ uint32_t flow_mark;\n };\n struct dpif_class;\n struct netdev_flow_dump;\n","prefixes":["ovs-dev","v2","1/8"]}