From patchwork Wed Jul 13 05:26:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pravin Shelar X-Patchwork-Id: 647729 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 3rq6mm4XCjz9sBX for ; Wed, 13 Jul 2016 15:28:08 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 566E410A59; Tue, 12 Jul 2016 22:27:21 -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 7285510A44 for ; Tue, 12 Jul 2016 22:27:18 -0700 (PDT) Received: from bar5.cudamail.com (unknown [192.168.21.12]) by mx1e4.cudamail.com (Postfix) with ESMTPS id EE1781E03D9 for ; Tue, 12 Jul 2016 23:27:17 -0600 (MDT) X-ASG-Debug-ID: 1468387637-09eadd19fc0b0c0001-byXFYA Received: from mx3-pf1.cudamail.com ([192.168.14.2]) by bar5.cudamail.com with ESMTP id SSxxMCXA21MFALv3 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 12 Jul 2016 23:27:17 -0600 (MDT) X-Barracuda-Envelope-From: pshelar@ovn.org X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.2 Received: from unknown (HELO relay5-d.mail.gandi.net) (217.70.183.197) by mx3-pf1.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 13 Jul 2016 05:27:17 -0000 Received-SPF: pass (mx3-pf1.cudamail.com: SPF record at ovn.org designates 217.70.183.197 as permitted sender) X-Barracuda-Apparent-Source-IP: 217.70.183.197 X-Barracuda-RBL-IP: 217.70.183.197 Received: from mfilter22-d.gandi.net (mfilter22-d.gandi.net [217.70.178.150]) by relay5-d.mail.gandi.net (Postfix) with ESMTP id E69B041C088; Wed, 13 Jul 2016 07:27:15 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter22-d.gandi.net Received: from relay5-d.mail.gandi.net ([IPv6:::ffff:217.70.183.197]) by mfilter22-d.gandi.net (mfilter22-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id ZZ2Cn28WjYpy; Wed, 13 Jul 2016 07:27:14 +0200 (CEST) X-Originating-IP: 24.130.10.65 Received: from localhost.localdomain.localdomain (c-24-130-10-65.hsd1.ca.comcast.net [24.130.10.65]) (Authenticated sender: pshelar@ovn.org) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id C7F7F41C093; Wed, 13 Jul 2016 07:27:13 +0200 (CEST) X-CudaMail-Envelope-Sender: pshelar@ovn.org From: Pravin B Shelar To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V1-711064251 X-CudaMail-DTE: 071216 X-CudaMail-Originating-IP: 217.70.183.197 Date: Tue, 12 Jul 2016 22:26:41 -0700 X-ASG-Orig-Subj: [##CM-V1-711064251##][PATCH 18/24] datapath: Move key memset to ovs_flow_key_extract_userspace() Message-Id: <1468387602-61955-9-git-send-email-pshelar@ovn.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1468387602-61955-1-git-send-email-pshelar@ovn.org> References: <1468387602-61955-1-git-send-email-pshelar@ovn.org> X-Barracuda-Connect: UNKNOWN[192.168.14.2] X-Barracuda-Start-Time: 1468387637 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 18/24] datapath: Move key memset to ovs_flow_key_extract_userspace() 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" Synchronize code with upstream ovs_nla_get_flow_metadata(). Signed-off-by: Pravin B Shelar --- datapath/flow.c | 2 ++ datapath/flow_netlink.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/datapath/flow.c b/datapath/flow.c index 4e6dfb2..390286c 100644 --- a/datapath/flow.c +++ b/datapath/flow.c @@ -732,6 +732,8 @@ int ovs_flow_key_extract_userspace(struct net *net, const struct nlattr *attr, { int err; + memset(key, 0, OVS_SW_FLOW_KEY_METADATA_SIZE); + /* Extract metadata from netlink attributes. */ err = ovs_nla_get_flow_metadata(net, attr, key, log); if (err) diff --git a/datapath/flow_netlink.c b/datapath/flow_netlink.c index fc0ee10..bc87090 100644 --- a/datapath/flow_netlink.c +++ b/datapath/flow_netlink.c @@ -1406,7 +1406,6 @@ int ovs_nla_get_flow_metadata(struct net *net, const struct nlattr *attr, memset(&match, 0, sizeof(match)); match.key = key; - memset(key, 0, OVS_SW_FLOW_KEY_METADATA_SIZE); memset(&key->ct, 0, sizeof(key->ct)); key->phy.in_port = DP_MAX_PORTS;