{"id":818458,"url":"http://patchwork.ozlabs.org/api/patches/818458/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/patch/1506404199-23579-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":"<1506404199-23579-4-git-send-email-yliu@fridaylinux.org>","list_archive_url":null,"date":"2017-09-26T05:36:33","name":"[ovs-dev,v3,3/9] netdev-dpdk: convert ufid to dpdk flow","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"67e8237925abd982c1a2ba117e3013d6ae9e2ea9","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/1506404199-23579-4-git-send-email-yliu@fridaylinux.org/mbox/","series":[{"id":5061,"url":"http://patchwork.ozlabs.org/api/series/5061/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/list/?series=5061","date":"2017-09-26T05:36:30","name":"OVS-DPDK flow offload with rte_flow","version":3,"mbox":"http://patchwork.ozlabs.org/series/5061/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/818458/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/818458/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=\"fHz2tGBd\"; 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 3y1VCK50fTz9t30\n\tfor ;\n\tTue, 26 Sep 2017 15:39:56 +1000 (AEST)","from mail.linux-foundation.org (localhost [127.0.0.1])\n\tby mail.linuxfoundation.org (Postfix) with ESMTP id B8EB9B0B;\n\tTue, 26 Sep 2017 05:38:58 +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 6EBF3BAE\n\tfor ; Tue, 26 Sep 2017 05:38:58 +0000 (UTC)","from mail-pg0-f43.google.com (mail-pg0-f43.google.com\n\t[74.125.83.43])\n\tby smtp1.linuxfoundation.org (Postfix) with ESMTPS id EB34E3D5\n\tfor ; Tue, 26 Sep 2017 05:38:57 +0000 (UTC)","by mail-pg0-f43.google.com with SMTP id m30so5357565pgn.6\n\tfor ; Mon, 25 Sep 2017 22:38:57 -0700 (PDT)","from localhost.localdomain ([101.228.205.132])\n\tby smtp.gmail.com with ESMTPSA id\n\to79sm13180077pfi.108.2017.09.25.22.38.32\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tMon, 25 Sep 2017 22:38:56 -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=Fx62Sf5QTG/BlHmlZ/7HUf3Lo11Xi/s9JIYKjaxTL5k=;\n\tb=fHz2tGBdS2Ao1Ve15Me3RobFt0NcYD/LJFW0u1u/PlzfKur/Sa1vRFN/4bz3bc3jQO\n\txspCNcOvXkQEoiKelSu8Q0t3YGNNyX0X8PWtOjdl3fcnXyGulpO3RD9oCC35I+E2Gm5o\n\tsWFlH6G1v8SxaxSfTE4w7GqTxiuJ0Czf90mkBwLm6aYe4OF4dFTRqqn7BRTPOUfI6T4i\n\t9DmgNJgLhtTGkcjDgqpAAhESZbaDwhMBC6KubzR4A65pU8DSdt1kwCTjYdNwg+oKOYGE\n\tF+qt8fLOxuy1DQaxO8nN5PL7kQ4XnAMvCAbnTmkcfBCdx/9JeX8QpqG6ulgdVjqL/3ur\n\tJAhA==","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=Fx62Sf5QTG/BlHmlZ/7HUf3Lo11Xi/s9JIYKjaxTL5k=;\n\tb=DvxMStfgMuvF6CwMY4TkuNnnIhLyqadv8RsYCJfhOZPhEr4gbUGvqdh2bFVumcGDUV\n\toO0/8/hqvG0BcwdTE3XiSvNokKeyvGMS+reB5qOKQD6n8TRtLqh4yDnpPo7UULI3W3J0\n\t3MwB0xn8t248/5jTBs/JcenhcQkcRxfsKXGLOjw7DhYewY7J/AyeKiLgXcL/OcO/Ox3v\n\tsP+SfNo7AmVawN01BPOUc6YI6kYOT9yM+BHkFn+KxaRYIUmWVLToqluggZxqPCXRjlYo\n\tApthBOV5aXY4PIilG5xuKuyG7PIEDT+/QOfV07bPdht4ga1jcXXcM4PLhGxFW1jkf5lA\n\ttfbQ==","X-Gm-Message-State":"AHPjjUiXcwc1ZSHXjPAPIBroQ1ERGGhOvad9q+Ta1gm2DTD30eSC2CD8\n\t/2qk5Xxg4XO5P6NE2Ts6tzouhBFkdH4rBA==","X-Google-Smtp-Source":"AOwi7QC29QCgIABtfwzYe906rAiLB9Z9v0QPPT6Zx7SARdCKquI2fZQDYQ7Z1d8DDjlGk7dwiamftA==","X-Received":"by 10.98.178.204 with SMTP id z73mr9841139pfl.107.1506404337115; \n\tMon, 25 Sep 2017 22:38:57 -0700 (PDT)","From":"Yuanhan Liu ","To":"dev@openvswitch.org","Date":"Tue, 26 Sep 2017 13:36:33 +0800","Message-Id":"<1506404199-23579-4-git-send-email-yliu@fridaylinux.org>","X-Mailer":"git-send-email 2.7.4","In-Reply-To":"<1506404199-23579-1-git-send-email-yliu@fridaylinux.org>","References":"<1506404199-23579-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","Cc":"Simon Horman ","Subject":"[ovs-dev] [PATCH v3 3/9] netdev-dpdk: convert ufid to dpdk flow","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":"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 \nSigned-off-by: Yuanhan Liu \nSigned-off-by: Finn Christensen \n---\n\nv3: warn on failed to find ufi_data_flow_data now assocociated with ufid\n---\n lib/netdev-dpdk.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++++\n 1 file changed, 92 insertions(+)","diff":"diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c\nindex f58e9be..1be9131 100644\n--- a/lib/netdev-dpdk.c\n+++ b/lib/netdev-dpdk.c\n@@ -36,6 +36,7 @@\n #include \n #include \n #include \n+#include \n \n #include \"dirs.h\"\n #include \"dp-packet.h\"\n@@ -58,6 +59,7 @@\n #include \"sset.h\"\n #include \"unaligned.h\"\n #include \"timeval.h\"\n+#include \"uuid.h\"\n #include \"unixctl.h\"\n \n enum {VIRTIO_RXQ, VIRTIO_TXQ, VIRTIO_QNUM};\n@@ -3312,6 +3314,96 @@ 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+ } else {\n+ VLOG_WARN(\"ufid \"UUID_FMT\"is not installed in the dpdk flow mapping\\n\",\n+ UUID_ARGS((struct uuid *)ufid));\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","v3","3/9"]}