From patchwork Fri Aug 5 14:36:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Kavanagh X-Patchwork-Id: 656214 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 3s5Ts016KJz9t0F for ; Sat, 6 Aug 2016 00:36:34 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id B50E810C5E; Fri, 5 Aug 2016 07:36:32 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e3.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 949B610C54 for ; Fri, 5 Aug 2016 07:36:30 -0700 (PDT) Received: from bar5.cudamail.com (localhost [127.0.0.1]) by mx1e3.cudamail.com (Postfix) with ESMTPS id E24A84200BC for ; Fri, 5 Aug 2016 08:36:29 -0600 (MDT) X-ASG-Debug-ID: 1470407789-09eadd5e84130eb0001-byXFYA Received: from mx1-pf1.cudamail.com ([192.168.24.1]) by bar5.cudamail.com with ESMTP id aH4bNkXv3AJvCbV8 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Fri, 05 Aug 2016 08:36:29 -0600 (MDT) X-Barracuda-Envelope-From: mark.b.kavanagh@intel.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.1 Received: from unknown (HELO mga09.intel.com) (134.134.136.24) by mx1-pf1.cudamail.com with SMTP; 5 Aug 2016 14:36:29 -0000 Received-SPF: pass (mx1-pf1.cudamail.com: SPF record at intel.com designates 134.134.136.24 as permitted sender) X-Barracuda-Apparent-Source-IP: 134.134.136.24 X-Barracuda-RBL-IP: 134.134.136.24 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP; 05 Aug 2016 07:36:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,474,1464678000"; d="scan'208";a="151178306" Received: from silpixa00380299.ir.intel.com ([10.237.222.17]) by fmsmga004.fm.intel.com with ESMTP; 05 Aug 2016 07:36:27 -0700 X-CudaMail-Envelope-Sender: mark.b.kavanagh@intel.com From: Mark Kavanagh To: dev@openvswitch.org, diproiettod@vmware.com X-CudaMail-MID: CM-E1-804023222 X-CudaMail-DTE: 080516 X-CudaMail-Originating-IP: 134.134.136.24 Date: Fri, 5 Aug 2016 15:36:18 +0100 X-ASG-Orig-Subj: [##CM-E1-804023222##][PATCH 1/7] ofproto: Consider datapath_type when looking for internal ports. Message-Id: <1470407784-158041-1-git-send-email-mark.b.kavanagh@intel.com> X-Mailer: git-send-email 1.9.3 X-Barracuda-Connect: UNKNOWN[192.168.24.1] X-Barracuda-Start-Time: 1470407789 X-Barracuda-Encrypted: ECDHE-RSA-AES256-GCM-SHA384 X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 X-ASG-Whitelist: EmailCat (corporate) Cc: i.maximets@samsung.com Subject: [ovs-dev] [PATCH 1/7] ofproto: Consider datapath_type when looking for internal ports. 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" From: Daniele Di Proietto Interfaces with type "internal" end up having a netdev with type "tap" in the dpif-netdev datapath, so a strcmp will fail to match internal interfaces. We can translate the types with ofproto_port_open_type() before calling strcmp to fix this. This fixes a minor issue where internal interfaces are considered non-internal in the userspace datapath for the purpose of adjusting the MTU. Signed-off-by: Daniele Di Proietto --- ofproto/ofproto.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index 8e59c69..088f91a 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -220,7 +220,8 @@ static void learned_cookies_flush(struct ofproto *, struct ovs_list *dead_cookie /* ofport. */ static void ofport_destroy__(struct ofport *) OVS_EXCLUDED(ofproto_mutex); static void ofport_destroy(struct ofport *, bool del); -static inline bool ofport_is_internal(const struct ofport *); +static inline bool ofport_is_internal(const struct ofproto *, + const struct ofport *); static int update_port(struct ofproto *, const char *devname); static int init_ports(struct ofproto *); @@ -2465,7 +2466,7 @@ static void ofport_remove(struct ofport *ofport) { struct ofproto *p = ofport->ofproto; - bool is_internal = ofport_is_internal(ofport); + bool is_internal = ofport_is_internal(p, ofport); connmgr_send_port_status(ofport->ofproto->connmgr, NULL, &ofport->pp, OFPPR_DELETE); @@ -2751,9 +2752,10 @@ init_ports(struct ofproto *p) } static inline bool -ofport_is_internal(const struct ofport *port) +ofport_is_internal(const struct ofproto *p, const struct ofport *port) { - return !strcmp(netdev_get_type(port->netdev), "internal"); + return !strcmp(netdev_get_type(port->netdev), + ofproto_port_open_type(p->type, "internal")); } /* Find the minimum MTU of all non-datapath devices attached to 'p'. @@ -2770,7 +2772,7 @@ find_min_mtu(struct ofproto *p) /* Skip any internal ports, since that's what we're trying to * set. */ - if (ofport_is_internal(ofport)) { + if (ofport_is_internal(p, ofport)) { continue; } @@ -2797,7 +2799,7 @@ update_mtu(struct ofproto *p, struct ofport *port) port->mtu = 0; return; } - if (ofport_is_internal(port)) { + if (ofport_is_internal(p, port)) { if (dev_mtu > p->min_mtu) { if (!netdev_set_mtu(port->netdev, p->min_mtu)) { dev_mtu = p->min_mtu; @@ -2827,7 +2829,7 @@ update_mtu_ofproto(struct ofproto *p) HMAP_FOR_EACH (ofport, hmap_node, &p->ports) { struct netdev *netdev = ofport->netdev; - if (ofport_is_internal(ofport)) { + if (ofport_is_internal(p, ofport)) { if (!netdev_set_mtu(netdev, p->min_mtu)) { ofport->mtu = p->min_mtu; }