From patchwork Thu Jun 12 14:20:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 359183 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1273814009F for ; Fri, 13 Jun 2014 00:20:24 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756023AbaFLOUU (ORCPT ); Thu, 12 Jun 2014 10:20:20 -0400 Received: from mail-we0-f173.google.com ([74.125.82.173]:51151 "EHLO mail-we0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752874AbaFLOUS (ORCPT ); Thu, 12 Jun 2014 10:20:18 -0400 Received: by mail-we0-f173.google.com with SMTP id t60so1358340wes.4 for ; Thu, 12 Jun 2014 07:20:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ySdADF5662VeB2PJKtJyl41oJMdW9eZFjLx4f9YVHuI=; b=kebBn9o8fy0sZB8FfA3lvDmVtPg1nfME0U5e4OXI8Qpv+JsKiXMZ7JWKOk2gzU3/pw 0GKs2GaaE0cIEcNohqIE557UqKGDWn/LhrhxRE/rec2+RTN3TH2N2HptLbexb3fwAB5M 9ANNrSC0MhXeblweDuLNRsn3BU77jZz116/YmdBzjNNqObbS4/cG+Xo37SQ4el2sgO9u x6qzEy1KRo3mQuhjQts1OnJmvG569k4+1945spd7rABH7XNpWxbgVyAKryZcQI1RlUdS h3R9PB8LZIZPFCIOoBU1+hWT7eGvfkyPAoY4BQyxm/1oug3GCBYL0psI1LmchgyjfPXl SzDw== X-Gm-Message-State: ALoCoQmpIQPYD3r+VhuefOPY9pPl7Fs5j/iILEVF+MsQc78nkj4gD1NR+FXEyIa/B+jEcxsMS2ix X-Received: by 10.180.20.141 with SMTP id n13mr7148065wie.6.1402582811255; Thu, 12 Jun 2014 07:20:11 -0700 (PDT) Received: from localhost (ip-94-113-121-85.net.upcbroadband.cz. [94.113.121.85]) by mx.google.com with ESMTPSA id o46sm4993777eef.31.2014.06.12.07.20.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Jun 2014 07:20:10 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, pshelar@nicira.com, cwang@twopensource.com, nicolas.dichtel@6wind.com, ebiederm@xmission.com, david@gibson.dropbear.id.au, sfeldma@cumulusnetworks.com, sucheta.chakraborty@qlogic.com, stephen@networkplumber.org Subject: [patch net-next] openvswitch: introduce rtnl ops stub Date: Thu, 12 Jun 2014 16:20:08 +0200 Message-Id: <1402582808-10443-1-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.9.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This stub now allows userspace to see IFLA_INFO_KIND for ovs master and IFLA_INFO_SLAVE_KIND for slave. Note that I added ops->setup check into newlink and dellink in order to prevent creating and deleting openvswitch instances using rtnl for now. Signed-off-by: Jiri Pirko --- net/core/rtnetlink.c | 5 ++++- net/openvswitch/datapath.c | 9 ++++++++- net/openvswitch/vport-internal_dev.c | 16 ++++++++++++++++ net/openvswitch/vport-internal_dev.h | 2 ++ 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 233b5ae..b874139 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -1767,7 +1767,7 @@ static int rtnl_dellink(struct sk_buff *skb, struct nlmsghdr *nlh) return -ENODEV; ops = dev->rtnl_link_ops; - if (!ops) + if (!ops || !ops->setup) return -EOPNOTSUPP; ops->dellink(dev, &list_kill); @@ -2028,6 +2028,9 @@ replay: return -EOPNOTSUPP; } + if (!ops->setup) + return -EOPNOTSUPP; + if (!ifname[0]) snprintf(ifname, IFNAMSIZ, "%s%%d", ops->kind); diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 0d407bc..5692fb1 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -2070,12 +2070,18 @@ static int __init dp_init(void) if (err) goto error_netns_exit; + err = ovs_internal_dev_rtnl_link_register(); + if (err) + goto error_unreg_notifier; + err = dp_register_genl(); if (err < 0) - goto error_unreg_notifier; + goto error_unreg_rtnl_link; return 0; +error_unreg_rtnl_link: + ovs_internal_dev_rtnl_link_unregister(); error_unreg_notifier: unregister_netdevice_notifier(&ovs_dp_device_notifier); error_netns_exit: @@ -2091,6 +2097,7 @@ error: static void dp_cleanup(void) { dp_unregister_genl(ARRAY_SIZE(dp_genl_families)); + ovs_internal_dev_rtnl_link_unregister(); unregister_netdevice_notifier(&ovs_dp_device_notifier); unregister_pernet_device(&ovs_net_ops); rcu_barrier(); diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c index 789af92..295471a 100644 --- a/net/openvswitch/vport-internal_dev.c +++ b/net/openvswitch/vport-internal_dev.c @@ -26,6 +26,7 @@ #include #include +#include #include "datapath.h" #include "vport-internal_dev.h" @@ -121,6 +122,10 @@ static const struct net_device_ops internal_dev_netdev_ops = { .ndo_get_stats64 = internal_dev_get_stats, }; +static struct rtnl_link_ops internal_dev_link_ops __read_mostly = { + .kind = "openvswitch", +}; + static void do_setup(struct net_device *netdev) { ether_setup(netdev); @@ -131,6 +136,7 @@ static void do_setup(struct net_device *netdev) netdev->priv_flags |= IFF_LIVE_ADDR_CHANGE; netdev->destructor = internal_dev_destructor; netdev->ethtool_ops = &internal_dev_ethtool_ops; + netdev->rtnl_link_ops = &internal_dev_link_ops; netdev->tx_queue_len = 0; netdev->features = NETIF_F_LLTX | NETIF_F_SG | NETIF_F_FRAGLIST | @@ -248,3 +254,13 @@ struct vport *ovs_internal_dev_get_vport(struct net_device *netdev) return internal_dev_priv(netdev)->vport; } + +int ovs_internal_dev_rtnl_link_register(void) +{ + return rtnl_link_register(&internal_dev_link_ops); +} + +void ovs_internal_dev_rtnl_link_unregister(void) +{ + rtnl_link_unregister(&internal_dev_link_ops); +} diff --git a/net/openvswitch/vport-internal_dev.h b/net/openvswitch/vport-internal_dev.h index 9a7d30e..1b179a1 100644 --- a/net/openvswitch/vport-internal_dev.h +++ b/net/openvswitch/vport-internal_dev.h @@ -24,5 +24,7 @@ int ovs_is_internal_dev(const struct net_device *); struct vport *ovs_internal_dev_get_vport(struct net_device *); +int ovs_internal_dev_rtnl_link_register(void); +void ovs_internal_dev_rtnl_link_unregister(void); #endif /* vport-internal_dev.h */