From patchwork Fri Aug 5 14:36:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Kavanagh X-Patchwork-Id: 656216 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 3s5TsF0F4Pz9t0F for ; Sat, 6 Aug 2016 00:36:48 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 0E5F110CC7; Fri, 5 Aug 2016 07:36:34 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v3.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id 1AEA710C54 for ; Fri, 5 Aug 2016 07:36:32 -0700 (PDT) Received: from bar6.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id 876691626AB for ; Fri, 5 Aug 2016 08:36:31 -0600 (MDT) X-ASG-Debug-ID: 1470407790-0b323721d6122990001-byXFYA Received: from mx1-pf1.cudamail.com ([192.168.24.1]) by bar6.cudamail.com with ESMTP id Egi1j4bHwQDqXxPn (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Fri, 05 Aug 2016 08:36:30 -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:30 -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:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,474,1464678000"; d="scan'208";a="151178313" Received: from silpixa00380299.ir.intel.com ([10.237.222.17]) by fmsmga004.fm.intel.com with ESMTP; 05 Aug 2016 07:36:29 -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-804023225 X-CudaMail-DTE: 080516 X-CudaMail-Originating-IP: 134.134.136.24 Date: Fri, 5 Aug 2016 15:36:20 +0100 X-ASG-Orig-Subj: [##CM-E1-804023225##][PATCH 3/7] netdev: Pass 'netdev_class' to ->run() and ->wait(). Message-Id: <1470407784-158041-3-git-send-email-mark.b.kavanagh@intel.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1470407784-158041-1-git-send-email-mark.b.kavanagh@intel.com> References: <1470407784-158041-1-git-send-email-mark.b.kavanagh@intel.com> X-Barracuda-Connect: UNKNOWN[192.168.24.1] X-Barracuda-Start-Time: 1470407790 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 3/7] netdev: Pass 'netdev_class' to ->run() and ->wait(). 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 This will allow run() and wait() methods to be shared between different classes and still perform class-specific work. Signed-off-by: Daniele Di Proietto --- lib/netdev-bsd.c | 6 +++--- lib/netdev-dummy.c | 4 ++-- lib/netdev-linux.c | 6 +++--- lib/netdev-provider.h | 14 ++++++++++---- lib/netdev-vport.c | 4 ++-- lib/netdev.c | 4 ++-- 6 files changed, 22 insertions(+), 16 deletions(-) diff --git a/lib/netdev-bsd.c b/lib/netdev-bsd.c index 2bba0ed..75a330b 100644 --- a/lib/netdev-bsd.c +++ b/lib/netdev-bsd.c @@ -146,7 +146,7 @@ static void ifr_set_flags(struct ifreq *, int flags); static int af_link_ioctl(unsigned long command, const void *arg); #endif -static void netdev_bsd_run(void); +static void netdev_bsd_run(const struct netdev_class *); static int netdev_bsd_get_mtu(const struct netdev *netdev_, int *mtup); static bool @@ -180,7 +180,7 @@ netdev_get_kernel_name(const struct netdev *netdev) * interface status changes, and eventually calls all the user callbacks. */ static void -netdev_bsd_run(void) +netdev_bsd_run(const struct netdev_class *netdev_class OVS_UNUSED) { rtbsd_notifier_run(); } @@ -190,7 +190,7 @@ netdev_bsd_run(void) * be called. */ static void -netdev_bsd_wait(void) +netdev_bsd_wait(const struct netdev_class *netdev_class OVS_UNUSED) { rtbsd_notifier_wait(); } diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c index a950409..2a6aa56 100644 --- a/lib/netdev-dummy.c +++ b/lib/netdev-dummy.c @@ -622,7 +622,7 @@ dummy_netdev_get_conn_state(struct dummy_packet_conn *conn) } static void -netdev_dummy_run(void) +netdev_dummy_run(const struct netdev_class *netdev_class OVS_UNUSED) { struct netdev_dummy *dev; @@ -636,7 +636,7 @@ netdev_dummy_run(void) } static void -netdev_dummy_wait(void) +netdev_dummy_wait(const struct netdev_class *netdev_class OVS_UNUSED) { struct netdev_dummy *dev; diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c index fa37bcf..1b5f7c1 100644 --- a/lib/netdev-linux.c +++ b/lib/netdev-linux.c @@ -526,7 +526,7 @@ static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20); * changes in the device miimon status, so we can use atomic_count. */ static atomic_count miimon_cnt = ATOMIC_COUNT_INIT(0); -static void netdev_linux_run(void); +static void netdev_linux_run(const struct netdev_class *); static int netdev_linux_do_ethtool(const char *name, struct ethtool_cmd *, int cmd, const char *cmd_name); @@ -623,7 +623,7 @@ netdev_linux_miimon_enabled(void) } static void -netdev_linux_run(void) +netdev_linux_run(const struct netdev_class *netdev_class OVS_UNUSED) { struct nl_sock *sock; int error; @@ -697,7 +697,7 @@ netdev_linux_run(void) } static void -netdev_linux_wait(void) +netdev_linux_wait(const struct netdev_class *netdev_class OVS_UNUSED) { struct nl_sock *sock; diff --git a/lib/netdev-provider.h b/lib/netdev-provider.h index ae390cb..5bcfeba 100644 --- a/lib/netdev-provider.h +++ b/lib/netdev-provider.h @@ -236,15 +236,21 @@ struct netdev_class { int (*init)(void); /* Performs periodic work needed by netdevs of this class. May be null if - * no periodic work is necessary. */ - void (*run)(void); + * no periodic work is necessary. + * + * 'netdev_class' points to the class. It is useful in case the same + * function is used to implement different classes. */ + void (*run)(const struct netdev_class *netdev_class); /* Arranges for poll_block() to wake up if the "run" member function needs * to be called. Implementations are additionally required to wake * whenever something changes in any of its netdevs which would cause their * ->change_seq() function to change its result. May be null if nothing is - * needed here. */ - void (*wait)(void); + * needed here. + * + * 'netdev_class' points to the class. It is useful in case the same + * function is used to implement different classes. */ + void (*wait)(const struct netdev_class *netdev_class); /* ## ---------------- ## */ /* ## netdev Functions ## */ diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c index 87a30f8..7eabd2c 100644 --- a/lib/netdev-vport.c +++ b/lib/netdev-vport.c @@ -321,7 +321,7 @@ netdev_vport_update_flags(struct netdev *netdev OVS_UNUSED, } static void -netdev_vport_run(void) +netdev_vport_run(const struct netdev_class *netdev_class OVS_UNUSED) { uint64_t seq; @@ -334,7 +334,7 @@ netdev_vport_run(void) } static void -netdev_vport_wait(void) +netdev_vport_wait(const struct netdev_class *netdev_class OVS_UNUSED) { uint64_t seq; diff --git a/lib/netdev.c b/lib/netdev.c index 75bf1cb..589d37c 100644 --- a/lib/netdev.c +++ b/lib/netdev.c @@ -160,7 +160,7 @@ netdev_run(void) struct netdev_registered_class *rc; CMAP_FOR_EACH (rc, cmap_node, &netdev_classes) { if (rc->class->run) { - rc->class->run(); + rc->class->run(rc->class); } } } @@ -178,7 +178,7 @@ netdev_wait(void) struct netdev_registered_class *rc; CMAP_FOR_EACH (rc, cmap_node, &netdev_classes) { if (rc->class->wait) { - rc->class->wait(); + rc->class->wait(rc->class); } } }