{"id":818463,"url":"http://patchwork.ozlabs.org/api/patches/818463/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/patch/1506404199-23579-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":"<1506404199-23579-8-git-send-email-yliu@fridaylinux.org>","list_archive_url":null,"date":"2017-09-26T05:36:37","name":"[ovs-dev,v3,7/9] netdev-dpdk: remove offloaded flow on deletion","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"81cbc3c1cd073762fabcafdc8796bf53bcaffb70","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-8-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/818463/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/818463/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=\"zJEalViS\"; 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 3y1VH920Gmz9t30\n\tfor ;\n\tTue, 26 Sep 2017 15:43:17 +1000 (AEST)","from mail.linux-foundation.org (localhost [127.0.0.1])\n\tby mail.linuxfoundation.org (Postfix) with ESMTP id A841DBED;\n\tTue, 26 Sep 2017 05:40:33 +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 8C822BEA\n\tfor ; Tue, 26 Sep 2017 05:40:32 +0000 (UTC)","from mail-pf0-f172.google.com (mail-pf0-f172.google.com\n\t[209.85.192.172])\n\tby smtp1.linuxfoundation.org (Postfix) with ESMTPS id 26AD93D4\n\tfor ; Tue, 26 Sep 2017 05:40:32 +0000 (UTC)","by mail-pf0-f172.google.com with SMTP id x78so5028568pff.10\n\tfor ; Mon, 25 Sep 2017 22:40:32 -0700 (PDT)","from localhost.localdomain ([101.228.205.132])\n\tby smtp.gmail.com with ESMTPSA id\n\to79sm13180077pfi.108.2017.09.25.22.40.20\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tMon, 25 Sep 2017 22:40:30 -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=8IuJSwyzAF/5D3NKQtPLOn/Zzq6urWYztIzVW4cPzIM=;\n\tb=zJEalViSdmAuDGxsVXQ/HnWIqSASLKmbQSn44enyJY4ZFojnksjhKRP7YfPk58+Jhb\n\tnfNG0S9sBL/sBXSQQkXQuJUdQVAkl1VlKKiWJ3TRJf1vqxIVz4Dj+b9mmBvNaoweHtRp\n\tRyLqGMW8om2IBPEs8c+o7u7RLZWQZrc4CVaVt2UoddtUWeyqEboYqkBlzkqy9VHqJ/Et\n\tcM4mvm1Ds9kwumBrAy4nhoNogs2W9wrxu94Y3vDAm/jeoFHq9XIdYZPvk+HOfpw8BZ6U\n\tqj7ecQCfSWPaQTERtdE9Cog5ykDx85ykwWdbt6vUrONvMLKxsZu+S4VhY9ZFbAaCsBmD\n\t94ug==","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=8IuJSwyzAF/5D3NKQtPLOn/Zzq6urWYztIzVW4cPzIM=;\n\tb=amSmX+pcYhrTPz1SpovUw97OXnBGk6QBnPG4DiCyRfmof64iJnMIybBG3PsmD1e4+a\n\toHTVjXbjGdzMRVkRmts2bWxFvZ3uuP0Oyd0dFMVABUFDw8riuC7L7uEQiLIT8NqbW6YJ\n\tvPYjYCF9CituS3dRFwk9+uAo1tYKXs1mvW/qmpK9mnMkss9TqcI/Kfxy3g0DgI2Jv6MH\n\tZxIGYiO0/H2C/nEf1+qx3aWYKLuXjhZZcvSfz0ZEIIWoZA0Xqxsz1orXuEb/zEDEqjrE\n\tnm2e6DS+Lyai1xXcwt9ZsqIT8VMH/W6ZhR0YIWOSEhvLvkoFx6DrdhhEWLiPRaXUqiLO\n\tqCLA==","X-Gm-Message-State":"AHPjjUhURm+3054okBxHO2P+qvARCtIq53C8bAGLW7FZJzQ1VuHEVG5x\n\tICv3bID6a4+7RI6icFXPe9VmhZVjkXX3uQ==","X-Google-Smtp-Source":"AOwi7QD4xCySTFSIaC3jdKnLhogxFgjYIJ6aC1KHQtnraUMz+Xvi1juRhswd7h1p7ZH9D2Ct90GtAA==","X-Received":"by 10.99.121.135 with SMTP id\n\tu129mr10098233pgc.260.1506404431367; \n\tMon, 25 Sep 2017 22:40:31 -0700 (PDT)","From":"Yuanhan Liu ","To":"dev@openvswitch.org","Date":"Tue, 26 Sep 2017 13:36:37 +0800","Message-Id":"<1506404199-23579-8-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.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","Cc":"Simon Horman ","Subject":"[ovs-dev] [PATCH v3 7/9] 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 | 6 ++++++\n lib/netdev-dpdk.c | 19 ++++++++++++++++++-\n 2 files changed, 24 insertions(+), 1 deletion(-)","diff":"diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c\nindex 1a70af6..13fd012 100644\n--- a/lib/dpif-netdev.c\n+++ b/lib/dpif-netdev.c\n@@ -1964,6 +1964,12 @@ 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+ 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+ }\n dp_netdev_remove_flow_mark_map(flow->mark);\n flow->has_mark = false;\n }\ndiff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c\nindex 3e2b96b..02c3677 100644\n--- a/lib/netdev-dpdk.c\n+++ b/lib/netdev-dpdk.c\n@@ -3881,6 +3881,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@@ -3888,7 +3905,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","v3","7/9"]}