{"id":810037,"url":"http://patchwork.ozlabs.org/api/patches/810037/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/patch/1504603381-30071-4-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-4-git-send-email-yliu@fridaylinux.org>","list_archive_url":null,"date":"2017-09-05T09:22:56","name":"[ovs-dev,v2,3/8] netdev-dpdk: convert ufid to dpdk flow","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"56fe618c33e4805d5e22ae7d4dd0f18fc8271533","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-4-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/810037/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810037/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=\"jw1V5Bx8\"; 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 3xmhCg21ZGz9sNr\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue,  5 Sep 2017 19:25:51 +1000 (AEST)","from mail.linux-foundation.org (localhost [127.0.0.1])\n\tby mail.linuxfoundation.org (Postfix) with ESMTP id 2D46AAD6;\n\tTue,  5 Sep 2017 09:23:48 +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 D2796AC9\n\tfor <dev@openvswitch.org>; Tue,  5 Sep 2017 09:23:46 +0000 (UTC)","from mail-pf0-f170.google.com (mail-pf0-f170.google.com\n\t[209.85.192.170])\n\tby smtp1.linuxfoundation.org (Postfix) with ESMTPS id 6A3CCE5\n\tfor <dev@openvswitch.org>; Tue,  5 Sep 2017 09:23:46 +0000 (UTC)","by mail-pf0-f170.google.com with SMTP id e199so6619909pfh.3\n\tfor <dev@openvswitch.org>; Tue, 05 Sep 2017 02:23:46 -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.43\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tTue, 05 Sep 2017 02:23:44 -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=O15ElIDGRdMP3J8fgSurvRNqIKAoMegPs4RnC05hYnc=;\n\tb=jw1V5Bx8vzrAED7nFNomDv2IhH2Tsa+3IaWFkz3W/zM5qcHa+jhMcWtysvuvAeY1Fi\n\tpmWzk5AFbMxpL+/kw7p2Jm+Pi+5fUMmiBgmoXMDpiZUsGweP1gjM47rF1QMThAUKtkIm\n\tMOf/BOsUVJLHIP9Nr3EUhcHvt66faFsnjX/oKRuXvNMraocSwp429EJuUlcL1INWHsEU\n\tom+nMr6G+Aia6IB5W/qPvSGXrXrV6UEW4i5i9RyIn9TH1WeoZSj6jkzFaIdlnChlipBx\n\tsMiyCNGtT4LfXz4FTdwZT/uBIGgpM9YKmpxhzuqommjzs3ZpFDLWS36uxi+maj3qbP5B\n\t8Qhw==","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=O15ElIDGRdMP3J8fgSurvRNqIKAoMegPs4RnC05hYnc=;\n\tb=EBi0IbilMwenI3txcDks5UwE6OHehljMd2TJz8TtB1t/c/bF82eDNzGZhDlhbip7dV\n\tGaIl6uJkIq9E7Z6XMLLZ+CpF7GEdbmJpKtGYWzN4ITrvUQ+WetYkU4dWqkvsg8RD/5jM\n\tHFReLiKon4Nvd02JXFBOsucIhPb7QYSjAXtCf1syxbnYVODVlKh2TEmqgvuUeyJ0UdYW\n\tTlFtzkfi46ZhqwERZhgFUke2E/nCfvYrBv9RXdePsl4uJUzKCN/z1xMFzpRghGquRRNc\n\tHNTJGriJuraoOF6s6X+AN/E2Ofda4JMZUcEUDfsuxEr+5sD2v+1mhsktJI4sBW/lkwMp\n\tH8xg==","X-Gm-Message-State":"AHPjjUiDuGMg8DWQ9aT9IerSjJFsELVLD4NZJ1Vl3MCyhs9KCcARG1WN\n\tpE6Otb9unwE5BK7vVQZ0XQ==","X-Google-Smtp-Source":"ADKCNb7Tiey8sLjv1vAAfKV/105dTBPqLSyJLr5pA22xjBXZk3wJICsZJQkcK+sxtHp30+Tbp+tZSw==","X-Received":"by 10.98.141.77 with SMTP id z74mr3068746pfd.179.1504603425647; \n\tTue, 05 Sep 2017 02:23:45 -0700 (PDT)","From":"Yuanhan Liu <yliu@fridaylinux.org>","To":"dev@openvswitch.org","Date":"Tue,  5 Sep 2017 17:22:56 +0800","Message-Id":"<1504603381-30071-4-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 3/8] netdev-dpdk: convert ufid to dpdk flow","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":"Flows offloaded to DPDK are identified by rte_flow pointer while OVS\nflows are identified by ufid. This patches adds a hmap to convert ufid\nto dpdk flow (rte_flow).\n\nMost of the code are stolen from netdev-tc-offloads.c, with some\nmodificatons.\n\nSome functions are marked as \"inline\", which is a trick to workaround\nthe temp \"functiond defined but not used\" warnings.\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 lib/netdev-dpdk.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++\n 1 file changed, 88 insertions(+)","diff":"diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c\nindex f58e9be..46f9885 100644\n--- a/lib/netdev-dpdk.c\n+++ b/lib/netdev-dpdk.c\n@@ -36,6 +36,7 @@\n #include <rte_meter.h>\n #include <rte_pci.h>\n #include <rte_vhost.h>\n+#include <rte_flow.h>\n \n #include \"dirs.h\"\n #include \"dp-packet.h\"\n@@ -3312,6 +3313,93 @@ unlock:\n     return err;\n }\n \n+/*\n+ * A mapping from ufid to dpdk rte_flow pointer\n+ */\n+\n+static struct hmap ufid_dpdk_flow = HMAP_INITIALIZER(&ufid_dpdk_flow);\n+static struct ovs_mutex ufid_lock = OVS_MUTEX_INITIALIZER;\n+\n+struct ufid_dpdk_flow_data {\n+    struct hmap_node node;\n+    ovs_u128 ufid;\n+    struct rte_flow *rte_flow;\n+};\n+\n+/*\n+ * Find ufid_dpdk_flow_data node associated with @ufid\n+ */\n+static struct ufid_dpdk_flow_data *\n+find_ufid_dpdk_flow_mapping(const ovs_u128 *ufid)\n+{\n+    size_t hash = hash_bytes(ufid, sizeof(*ufid), 0);\n+    struct ufid_dpdk_flow_data *data = NULL;\n+\n+    ovs_mutex_lock(&ufid_lock);\n+    HMAP_FOR_EACH_WITH_HASH (data, node, hash, &ufid_dpdk_flow) {\n+        if (ovs_u128_equals(*ufid, data->ufid)) {\n+            break;\n+        }\n+    }\n+    ovs_mutex_unlock(&ufid_lock);\n+\n+    return data;\n+}\n+\n+/*\n+ * Remove ufid_dpdk_flow_data node associated with @ufid\n+ */\n+static inline void\n+del_ufid_dpdk_flow_mapping(const ovs_u128 *ufid)\n+{\n+    struct ufid_dpdk_flow_data *data;\n+\n+    data = find_ufid_dpdk_flow_mapping(ufid);\n+    if (data) {\n+        ovs_mutex_lock(&ufid_lock);\n+        hmap_remove(&ufid_dpdk_flow, &data->node);\n+        free(data);\n+        ovs_mutex_unlock(&ufid_lock);\n+    }\n+}\n+\n+/* Add ufid to dpdk_flow mapping */\n+static inline void\n+add_ufid_dpdk_flow_mapping(const ovs_u128 *ufid, struct rte_flow *rte_flow)\n+{\n+    size_t hash = hash_bytes(ufid, sizeof(*ufid), 0);\n+    struct ufid_dpdk_flow_data *data = xzalloc(sizeof(*data));\n+\n+    /*\n+     * We should not simply overwrite an existing rte flow.\n+     * We should have deleted it first before re-adding it.\n+     * Thus, if following assert triggers, something is wrong:\n+     * the rte_flow is not destroyed.\n+     */\n+    ovs_assert(find_ufid_dpdk_flow_mapping(ufid) == NULL);\n+\n+    data->ufid = *ufid;\n+    data->rte_flow = rte_flow;\n+\n+    ovs_mutex_lock(&ufid_lock);\n+    hmap_insert(&ufid_dpdk_flow, &data->node, hash);\n+    ovs_mutex_unlock(&ufid_lock);\n+}\n+\n+/* Get rte_flow by ufid.\n+ *\n+ * Returns rte rte_flow if successful. Otherwise returns 0.\n+ */\n+static inline struct rte_flow *\n+get_rte_flow_by_ufid(const ovs_u128 *ufid)\n+{\n+    struct ufid_dpdk_flow_data *data;\n+\n+    data = find_ufid_dpdk_flow_mapping(ufid);\n+    return data ? data->rte_flow : NULL;\n+}\n+\n+\n #define NETDEV_DPDK_CLASS(NAME, INIT, CONSTRUCT, DESTRUCT,    \\\n                           SET_CONFIG, SET_TX_MULTIQ, SEND,    \\\n                           GET_CARRIER, GET_STATS,             \\\n","prefixes":["ovs-dev","v2","3/8"]}