From patchwork Fri Jul 15 10:19:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarno Rajahalme X-Patchwork-Id: 648749 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3rrT9r427Lz9s9N for ; Fri, 15 Jul 2016 20:21:04 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 31FB510CCF; Fri, 15 Jul 2016 03:20:06 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e4.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 2FAF310C81 for ; Fri, 15 Jul 2016 03:20:01 -0700 (PDT) Received: from bar5.cudamail.com (unknown [192.168.21.12]) by mx1e4.cudamail.com (Postfix) with ESMTPS id 878DC1E00A9 for ; Fri, 15 Jul 2016 04:20:00 -0600 (MDT) X-ASG-Debug-ID: 1468578000-09eadd107c11ad0001-byXFYA Received: from mx1-pf2.cudamail.com ([192.168.24.2]) by bar5.cudamail.com with ESMTP id ky6LswiQEJJ1V018 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 15 Jul 2016 04:20:00 -0600 (MDT) X-Barracuda-Envelope-From: jarno@ovn.org X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.2 Received: from unknown (HELO relay4-d.mail.gandi.net) (217.70.183.196) by mx1-pf2.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 15 Jul 2016 10:19:59 -0000 Received-SPF: pass (mx1-pf2.cudamail.com: SPF record at ovn.org designates 217.70.183.196 as permitted sender) X-Barracuda-Apparent-Source-IP: 217.70.183.196 X-Barracuda-RBL-IP: 217.70.183.196 Received: from mfilter19-d.gandi.net (mfilter19-d.gandi.net [217.70.178.147]) by relay4-d.mail.gandi.net (Postfix) with ESMTP id BFD5D17209A; Fri, 15 Jul 2016 12:19:58 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter19-d.gandi.net Received: from relay4-d.mail.gandi.net ([IPv6:::ffff:217.70.183.196]) by mfilter19-d.gandi.net (mfilter19-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id OyicrOB9L27J; Fri, 15 Jul 2016 12:19:57 +0200 (CEST) X-Originating-IP: 85.76.8.181 Received: from sc9-mailhost2.vmware.com (85-76-8-181-nat.elisa-mobile.fi [85.76.8.181]) (Authenticated sender: jarno@ovn.org) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 1B05A1720BF; Fri, 15 Jul 2016 12:19:56 +0200 (CEST) X-CudaMail-Envelope-Sender: jarno@ovn.org From: Jarno Rajahalme To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E2-714004392 X-CudaMail-DTE: 071516 X-CudaMail-Originating-IP: 217.70.183.196 Date: Fri, 15 Jul 2016 03:19:14 -0700 X-ASG-Orig-Subj: [##CM-E2-714004392##][PATCH 08/13] ofproto: Report flow mods also from bundles. Message-Id: <1468577959-98487-8-git-send-email-jarno@ovn.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1468577959-98487-1-git-send-email-jarno@ovn.org> References: <1468577959-98487-1-git-send-email-jarno@ovn.org> X-Barracuda-Connect: UNKNOWN[192.168.24.2] X-Barracuda-Start-Time: 1468578000 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Subject: [ovs-dev] [PATCH 08/13] ofproto: Report flow mods also from bundles. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" Flow mod stats get skewed if they are not reported from bundles. Move reporting to ofproto_flow_mod_finish() so that it will be done in all cases. Signed-off-by: Jarno Rajahalme --- ofproto/ofproto.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index c36df4e..e96aeb7 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -5468,7 +5468,7 @@ handle_flow_mod(struct ofconn *ofconn, const struct ofp_header *oh) error = reject_slave_controller(ofconn); if (error) { - goto exit; + return error; } ofpbuf_use_stub(&ofpacts, ofpacts_stub, sizeof ofpacts_stub); @@ -5480,15 +5480,8 @@ handle_flow_mod(struct ofconn *ofconn, const struct ofp_header *oh) struct openflow_mod_requester req = { ofconn, oh }; error = handle_flow_mod__(ofproto, &ofm, &req); } - if (error) { - goto exit_free_ofpacts; - } - ofconn_report_flow_mod(ofconn, ofm.fm.command); - -exit_free_ofpacts: ofpbuf_uninit(&ofpacts); -exit: return error; } @@ -7057,6 +7050,10 @@ ofproto_flow_mod_finish(struct ofproto *ofproto, default: break; } + + if (req) { + ofconn_report_flow_mod(req->ofconn, ofm->fm.command); + } } /* Commit phases (all while locking ofproto_mutex):