{"id":810817,"url":"http://patchwork.ozlabs.org/api/1.2/patches/810817/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/patch/20170906221252.17257-1-joe@ovn.org/","project":{"id":47,"url":"http://patchwork.ozlabs.org/api/1.2/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":"<20170906221252.17257-1-joe@ovn.org>","list_archive_url":null,"date":"2017-09-06T22:12:52","name":"[ovs-dev] ofproto-dpif-upcall: Transition ukey on dp_ops error.","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"179a8a481e67124e243ec34d108caeca858e8bec","submitter":{"id":67727,"url":"http://patchwork.ozlabs.org/api/1.2/people/67727/?format=json","name":"Joe Stringer","email":"joe@ovn.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/openvswitch/patch/20170906221252.17257-1-joe@ovn.org/mbox/","series":[{"id":1891,"url":"http://patchwork.ozlabs.org/api/1.2/series/1891/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/list/?series=1891","date":"2017-09-06T22:12:52","name":"[ovs-dev] ofproto-dpif-upcall: Transition ukey on dp_ops error.","version":1,"mbox":"http://patchwork.ozlabs.org/series/1891/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810817/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810817/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=)","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 3xndBT1Rlzz9rxm\n\tfor ;\n\tThu, 7 Sep 2017 08:13:04 +1000 (AEST)","from mail.linux-foundation.org (localhost [127.0.0.1])\n\tby mail.linuxfoundation.org (Postfix) with ESMTP id 62F8AB88;\n\tWed, 6 Sep 2017 22:13:01 +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 E42ABB77\n\tfor ; Wed, 6 Sep 2017 22:12:59 +0000 (UTC)","from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net\n\t[217.70.183.196])\n\tby smtp1.linuxfoundation.org (Postfix) with ESMTPS id 70113483\n\tfor ; Wed, 6 Sep 2017 22:12:59 +0000 (UTC)","from carno.eng.vmware.com (unknown [208.91.1.34])\n\t(Authenticated sender: joe@ovn.org)\n\tby relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 76DC317209C\n\tfor ; Thu, 7 Sep 2017 00:12:57 +0200 (CEST)"],"X-Greylist":"domain auto-whitelisted by SQLgrey-1.7.6","X-Originating-IP":"208.91.1.34","From":"Joe Stringer ","To":"dev@openvswitch.org","Date":"Wed, 6 Sep 2017 15:12:52 -0700","Message-Id":"<20170906221252.17257-1-joe@ovn.org>","X-Mailer":"git-send-email 2.14.1","X-Spam-Status":"No, score=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW\n\tautolearn=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] ofproto-dpif-upcall: Transition ukey on dp_ops\n\terror.","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":"In most situations, we don't expect that a flow we've successfully\ndumped, which we intend to delete, cannot be deleted. However, to make\nthis code more resilient to ensure that ukeys *will* transition in all\ncases (including an error at this stage), grab the lock and transition\nthis ukey forward to the evicted state, effectively treating a failure\nto delete as \"this flow is already gone\".\n\nIf we subsequently find out that it wasn't deleted, then that's ok - we\nwill re-dump, and validate at that stage, which should lead to creating\na new ukey or deleting the datapath flow when that happens.\n\nSigned-off-by: Joe Stringer \n---\n ofproto/ofproto-dpif-upcall.c | 5 +++++\n 1 file changed, 5 insertions(+)","diff":"diff --git a/ofproto/ofproto-dpif-upcall.c b/ofproto/ofproto-dpif-upcall.c\nindex 4a71bbe258df..bd324fbb6323 100644\n--- a/ofproto/ofproto-dpif-upcall.c\n+++ b/ofproto/ofproto-dpif-upcall.c\n@@ -2227,6 +2227,11 @@ push_dp_ops(struct udpif *udpif, struct ukey_op *ops, size_t n_ops)\n \n if (op->dop.error) {\n /* flow_del error, 'stats' is unusable. */\n+ if (op->ukey) {\n+ ovs_mutex_lock(&op->ukey->mutex);\n+ transition_ukey(op->ukey, UKEY_EVICTED);\n+ ovs_mutex_unlock(&op->ukey->mutex);\n+ }\n continue;\n }\n \n","prefixes":["ovs-dev"]}