{"id":810048,"url":"http://patchwork.ozlabs.org/api/patches/810048/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/patch/1504603381-30071-8-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-8-git-send-email-yliu@fridaylinux.org>","list_archive_url":null,"date":"2017-09-05T09:23:00","name":"[ovs-dev,v2,7/8] netdev-dpdk: remove offloaded flow on deletion","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"3550b5abf51e716b4034327309c0aa0be92f245d","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-8-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/810048/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810048/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=\"NYw/fsnO\"; 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 3xmhGm4hynz9s0g\n\tfor ;\n\tTue, 5 Sep 2017 19:28:32 +1000 (AEST)","from mail.linux-foundation.org (localhost [127.0.0.1])\n\tby mail.linuxfoundation.org (Postfix) with ESMTP id 90196B09;\n\tTue, 5 Sep 2017 09:23:59 +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 AAE9EB09\n\tfor ; Tue, 5 Sep 2017 09:23:57 +0000 (UTC)","from mail-pg0-f51.google.com (mail-pg0-f51.google.com\n\t[74.125.83.51])\n\tby smtp1.linuxfoundation.org (Postfix) with ESMTPS id 5FFBBE0\n\tfor ; Tue, 5 Sep 2017 09:23:57 +0000 (UTC)","by mail-pg0-f51.google.com with SMTP id j6so8141197pgc.1\n\tfor ; Tue, 05 Sep 2017 02:23:57 -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.54\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tTue, 05 Sep 2017 02:23:55 -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=/+HkXwFcszP2aChN/oi9OGIAKgfBrKvXdnGfajev1AI=;\n\tb=NYw/fsnO9xXTPY03yBFi0pyEsLZ3TrP2FHj7N4dclbffgdWMwDxM39YZZAxxqa61yH\n\t1ziiTBOW7o/TGFxknXG8r8fcU/CyM8pt/GopmgDSj/sPa+gvxwJUerJJoGlSJwiYY0Dw\n\tJcLF6/9OEN3JZTDxoesgvHBs0kX7I3oxvKYJEX6ea0YKdSm/GRbeJ2Y9DM8nFr7JUy02\n\teCWS+Y3jq70TP/4MeUiKtt5MQUZQNd/jnbO+PiS7AEKajUwN7OopqB3q7hbPjPiZktBo\n\txZbuew45C1ADNev9K9FPl10QGc8WLHe+oSDb0qluVisUiGFwD5loljnCM9OpTvvrlVGo\n\tyk4w==","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=/+HkXwFcszP2aChN/oi9OGIAKgfBrKvXdnGfajev1AI=;\n\tb=WwGOMtvIHVbfvP4i4dU6V+LnC0A9466F0SJYeeLnU/bVWmmy0GH10N3z3hWL+fmu18\n\tj8+irdhpLqIvjsNedthtfMDxLStiWUXDk0/95JkM7nAg5TIZh1Svh1CGnMRttuuGwKwH\n\tL+qYnQxnXRgTtbPf5vxbaIKd7rEflFWODXaUu9mhmhiSxezq+B7qwaAffop+qITOMHzN\n\tPDTDochpJTnlYYVw1iEiKZ03OsZhpnMdB0CM3Bnt6kMoXPMEgiZQeX/DUpdpMYFgPI/G\n\tW59+mkRKU43OCQcslfftuMJhR1oerdm8Mrk87XMxPSMX/iEvavBdbVE5NxURiDfSmpyC\n\tLcLw==","X-Gm-Message-State":"AHPjjUipnxt4ZJgWabSJrfDWbon2HS6hBwKJ23hfsTKuYNh97SA0PHBr\n\tUAV5x2u7zXaOHzUGGIWqIx1Q","X-Google-Smtp-Source":"ADKCNb7CXjpBGZtkbm3/8mWuTacOKGKepDZV8geCcGF+uqK8b+E7lXSTpL7WQquTNCPvj8ZrZK5eNQ==","X-Received":"by 10.84.236.69 with SMTP id h5mr3608198pln.338.1504603436651;\n\tTue, 05 Sep 2017 02:23:56 -0700 (PDT)","From":"Yuanhan Liu ","To":"dev@openvswitch.org","Date":"Tue, 5 Sep 2017 17:23:00 +0800","Message-Id":"<1504603381-30071-8-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.5 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,\n\tRCVD_IN_DNSWL_NONE,\n\tRCVD_IN_SORBS_SPAM 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 7/8] netdev-dpdk: remove offloaded flow on\n\tdeletion","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":"Inovke netdev class '->flow_del' method on flow deletion. The dpdk netdev\nimplementation will then remove the rte flow associated with the ufid.\n\nCo-authored-by: Finn Christensen \nSigned-off-by: Yuanhan Liu \nSigned-off-by: Finn Christensen \n---\n\nv2: - check the returned \"port\" from dp_netdev_lookup_port\n - error log when flow is not found\n---\n lib/dpif-netdev.c | 10 ++++++++--\n lib/netdev-dpdk.c | 19 ++++++++++++++++++-\n 2 files changed, 26 insertions(+), 3 deletions(-)","diff":"diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c\nindex 3099c73..2fbaa96 100644\n--- a/lib/dpif-netdev.c\n+++ b/lib/dpif-netdev.c\n@@ -1857,8 +1857,14 @@ dp_netdev_pmd_remove_flow(struct dp_netdev_pmd_thread *pmd,\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+ struct dp_netdev_port *port;\n+\n+ port = dp_netdev_lookup_port(pmd->dp, in_port);\n+ if (port) {\n+ netdev_flow_del(port->netdev, &flow->ufid, NULL);\n+ cmap_remove(&pmd->mark_to_flow, mark_node, flow->mark);\n+ flow->has_mark = false;\n+ }\n }\n flow->dead = true;\n \ndiff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c\nindex 320fe80..e363c92 100644\n--- a/lib/netdev-dpdk.c\n+++ b/lib/netdev-dpdk.c\n@@ -3853,6 +3853,23 @@ netdev_dpdk_flow_put(struct netdev *netdev, struct match *match,\n actions_len, ufid, info);\n }\n \n+static int\n+netdev_dpdk_flow_del(struct netdev *netdev, const ovs_u128 *ufid,\n+ struct dpif_flow_stats *stats OVS_UNUSED)\n+{\n+\n+ struct rte_flow *rte_flow = get_rte_flow_by_ufid(ufid);\n+\n+ if (!rte_flow) {\n+ VLOG_ERR(\"failed to find flow associated with ufid \" UUID_FMT \"\\n\",\n+ UUID_ARGS((struct uuid *)ufid));\n+ return -1;\n+ }\n+\n+ return netdev_dpdk_destroy_rte_flow(netdev_dpdk_cast(netdev),\n+ ufid, rte_flow);\n+}\n+\n #define DPDK_FLOW_OFFLOAD_API \\\n NULL, /* flow_flush */ \\\n NULL, /* flow_dump_create */ \\\n@@ -3860,7 +3877,7 @@ netdev_dpdk_flow_put(struct netdev *netdev, struct match *match,\n NULL, /* flow_dump_next */ \\\n netdev_dpdk_flow_put, \\\n NULL, /* flow_get */ \\\n- NULL, /* flow_del */ \\\n+ netdev_dpdk_flow_del, \\\n NULL /* init_flow_api */\n \n \n","prefixes":["ovs-dev","v2","7/8"]}