Merge lp:~cyphermox/powerd/wifi-powersave into lp:powerd

[Mathieu Trudel-Lapierre]

Use netlink to set up powersave for wireless devices on startup.

Investigating the use of netlink to set up powersave for wireless devices.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:145
http://jenkins.qa.ubuntu.com/job/powerd-ci/170/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/powerd-utopic-armhf-ci/22/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/powerd-ci/170/rebuild

review: Needs Fixing (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

Abandoning; this code would not support the module removal and readding that happens when flight mode is toggled.

review: Disapprove

Unmerged revisions

145. By Mathieu Trudel-Lapierre on 2014-10-23

Implement setting powersave via netlink on startup

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-09-30 20:52:33 +0000
+++ CMakeLists.txt	2014-10-23 16:07:31 +0000
@@ -26,6 +26,7 @@
 pkg_check_modules(GIO-UNIX gio-unix-2.0)
 pkg_check_modules(UPOWER_GLIB upower-glib)
 pkg_check_modules(UUID uuid)
+pkg_check_modules(LIBNL3 libnl-3.0 libnl-genl-3.0)
 
 set(POWERD_GENERATED_SOURCES
   ${GDBUS_NAME}.c
@@ -50,6 +51,7 @@
   src/log.c
   src/power-request.c
   src/power-source.c
+  src/powerd-netlink.c
   src/powerd-client.c
   src/powerd-object.c
   src/powerd-sensors.cpp
@@ -67,6 +69,7 @@
   ${GIO-UNIX_LIBRARY_DIRS}
   ${UPOWER_GLIB_LIBRARY_DIRS}
   ${UUID_LIBRARY_DIRS}
+  ${LIBNL3_LIBRARY_DIRS}
 )
 
 include_directories(
@@ -76,6 +79,7 @@
   ${GIO-UNIX_INCLUDE_DIRS}
   ${UPOWER_GLIB_INCLUDE_DIRS}
   ${UUID_INCLUDE_DIRS}
+  ${LIBNL3_INCLUDE_DIRS}
   ${PROJECT_SOURCE_DIR}/libsuspend
   ${CMAKE_CURRENT_BINARY_DIR}/src
 )
@@ -111,6 +115,7 @@
   "-lhardware"
   ${UPOWER_GLIB_LIBRARIES}
   ${UUID_LIBRARIES}
+  ${LIBNL3_LIBRARIES}
 )
 
 install(

=== added file 'src/powerd-netlink.c'
--- src/powerd-netlink.c	1970-01-01 00:00:00 +0000
+++ src/powerd-netlink.c	2014-10-23 16:07:31 +0000
@@ -0,0 +1,281 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This file is part of powerd.
+ *
+ * powerd is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * powerd is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+#include <gio/gio.h>
+#include <inttypes.h>
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
+
+#include <ifaddrs.h>
+#include <net/if.h>
+#include <linux/nl80211.h> 
+#include <wireless.h>
+
+#include <netlink/netlink.h>
+#include <netlink/genl/genl.h>
+#include <netlink/genl/family.h>
+#include <netlink/genl/ctrl.h>
+#include <netlink/msg.h>
+#include <netlink/attr.h>
+
+#include "powerd-netlink.h"
+
+struct _PowerdNetlinkPrivate {
+	struct nl_sock *socket;
+	struct nl_cb *cb;
+	gboolean is_generic;
+	char *type;
+	int type_id;
+	gboolean valid;
+};
+
+static void powerd_netlink_class_init (PowerdNetlinkClass * klass);
+static void powerd_netlink_init       (PowerdNetlink *      self);
+static void powerd_netlink_dispose    (GObject *           object);
+static void powerd_netlink_finalize   (GObject *           object);
+
+G_DEFINE_TYPE (PowerdNetlink, powerd_netlink, G_TYPE_OBJECT);
+
+#define POWERD_NETLINK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), POWERD_TYPE_NETLINK, PowerdNetlinkPrivate))
+
+static struct nl_cb *
+set_socket_cb (struct nl_sock *sock, int cb_level)
+{
+	struct nl_cb *cb;
+
+        cb = nl_cb_alloc(cb_level);
+	nl_socket_set_cb(sock, cb);
+
+	return cb;
+}
+
+static struct nl_sock *
+allocate_netlink_socket()
+{
+	struct nl_sock *sock;
+
+	sock = nl_socket_alloc();
+        if (!sock) {
+                g_warning ("Failed to allocate netlink socket");
+                return NULL;
+        }
+
+        nl_socket_set_buffer_size(sock, 8192, 8192);
+
+	return sock;
+}
+
+static gboolean
+get_generic_netlink(PowerdNetlink *self)
+{
+	PowerdNetlinkPrivate *priv = POWERD_NETLINK_GET_PRIVATE(self);
+	
+	g_return_val_if_fail (priv->socket != NULL, FALSE);
+
+	if (genl_connect(priv->socket) < 0) {
+		g_warning ("Could not make netlink socket generic");
+		return FALSE;
+        }
+
+	return TRUE;
+}
+
+/* Instance */
+static void
+powerd_netlink_init (PowerdNetlink *self)
+{
+	self->priv = POWERD_NETLINK_GET_PRIVATE(self);
+	self->priv->socket = allocate_netlink_socket();
+	self->priv->is_generic = FALSE;
+	self->priv->type = NULL;
+	self->priv->valid = self->priv->socket != NULL;
+
+	return;
+}
+
+/* Class Init */
+static void
+powerd_netlink_class_init (PowerdNetlinkClass *self)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (self);
+
+	g_type_class_add_private (self, sizeof (PowerdNetlinkPrivate));
+	object_class->dispose = powerd_netlink_dispose;
+	object_class->finalize = powerd_netlink_finalize;
+
+	return;
+}
+
+/* Clean up references */
+static void
+powerd_netlink_dispose (GObject *object)
+{
+	PowerdNetlink * self = POWERD_NETLINK(object);
+	PowerdNetlinkPrivate *priv = POWERD_NETLINK_GET_PRIVATE (self);
+
+	if (priv->type) {
+		g_free (priv->type);
+		priv->type = NULL;
+	}
+
+        nl_cb_put(priv->cb);
+        nl_socket_free(priv->socket);
+
+	priv->valid = FALSE;
+
+	return;
+}
+
+static void
+powerd_netlink_finalize (GObject *object)
+{
+	return;
+}
+
+static int
+get_powersave_val (gboolean powersave)
+{
+	if (powersave)
+		return NL80211_PS_ENABLED;
+	else
+		return NL80211_PS_DISABLED;
+}
+
+void
+powerd_netlink_set_cb (PowerdNetlink *self, int cb)
+{
+	PowerdNetlinkPrivate *priv = POWERD_NETLINK_GET_PRIVATE (self);
+
+	g_return_val_if_fail (priv->valid, FALSE);
+
+	set_socket_cb (priv->socket, cb);
+}
+
+void
+powerd_netlink_make_generic (PowerdNetlink *self)
+{
+	PowerdNetlinkPrivate *priv = POWERD_NETLINK_GET_PRIVATE (self);
+
+	g_return_val_if_fail (!priv->is_generic, TRUE);
+	g_return_val_if_fail (priv->valid, FALSE);
+
+	priv->valid = get_generic_netlink (self);
+	if (priv->valid)
+		priv->is_generic = TRUE;
+}
+
+gboolean
+powerd_netlink_set_type (PowerdNetlink *self, char *type)
+{
+	PowerdNetlinkPrivate *priv = POWERD_NETLINK_GET_PRIVATE (self);
+
+	g_return_val_if_fail (priv->is_generic, FALSE);
+	g_return_val_if_fail (priv->valid, FALSE);
+
+	priv->type = g_strdup (type);
+        priv->type_id = genl_ctrl_resolve(priv->socket, type);
+
+	return priv->type_id >= 0;
+}
+
+gboolean
+powerd_netlink_set_device_powersave(PowerdNetlink *self, char *devname, gboolean powersave)
+{
+	PowerdNetlinkPrivate *priv = POWERD_NETLINK_GET_PRIVATE (self);
+        struct nl_msg *msg;
+	int devidx;
+	gboolean result = FALSE;
+	int iferr = 0;
+
+	/* Fail now if we're not dealing with a valid nl80211 netlink */
+	g_return_val_if_fail (priv->valid, FALSE);
+	g_return_val_if_fail (!g_strcmp0 (priv->type, "nl80211"), FALSE);
+
+       	devidx = if_nametoindex(devname);
+	
+	msg = nlmsg_alloc();
+	genlmsg_put(msg, 0, 0, priv->type_id, 0, 0, NL80211_CMD_SET_POWER_SAVE, 0);
+
+	NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, devidx);
+	NLA_PUT_U32(msg, NL80211_ATTR_PS_STATE, get_powersave_val(powersave));
+
+	iferr = nl_send_auto_complete(priv->socket, msg);
+	if (iferr >= 0)
+		result = TRUE;
+
+	nlmsg_free(msg);
+
+nla_put_failure: 
+	return result;
+}
+
+gboolean
+powerd_netlink_set_wifi_powersave(PowerdNetlink *self, gboolean powersave)
+{
+	PowerdNetlinkPrivate *priv = POWERD_NETLINK_GET_PRIVATE (self);
+	struct ifaddrs *ifa, *ifaddr;
+	gboolean result = FALSE;
+	int skfd;
+	int n, errcnt = 0;
+
+	/* Fail now if we're not dealing with a valid nl80211 netlink */
+	g_return_val_if_fail (priv->valid, FALSE);
+	g_return_val_if_fail (!g_strcmp0 (priv->type, "nl80211"), FALSE);
+
+	skfd = socket(AF_INET, SOCK_DGRAM, 0);
+        if (getifaddrs(&ifaddr) < 0) {
+		g_warning ("Could not get network interfaces");
+		goto out;
+	}
+
+	for (ifa = ifaddr, n = 0; ifa != NULL; ifa = ifa->ifa_next, n++) {
+		struct ifreq pwrq;
+
+		if (ifa->ifa_addr == NULL)
+			continue;
+
+		if (ifa->ifa_addr->sa_family != AF_INET)
+			continue;
+
+		strncpy(pwrq.ifr_name, ifa->ifa_name, IFNAMSIZ);
+		if (ioctl(skfd, SIOCGIWNAME, &pwrq) < 0) {
+			/* We can't set wifi powersave if the device isn't
+			 * wifi...
+			 */
+			continue;
+		}
+
+		if (!powerd_netlink_set_device_powersave (self,
+		                                          ifa->ifa_name,
+		                                          powersave))
+			errcnt++; 
+	}
+
+	if (errcnt == 0)
+		result = TRUE;
+
+out:
+	freeifaddrs(ifaddr);
+	return result;
+}
+

=== added file 'src/powerd-netlink.h'
--- src/powerd-netlink.h	1970-01-01 00:00:00 +0000
+++ src/powerd-netlink.h	2014-10-23 16:07:31 +0000
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This file is part of powerd.
+ *
+ * powerd is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * powerd is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __POWERD_NETLINK_H__
+#define __POWERD_NETLINK_H__
+
+#include <netlink/netlink.h>
+
+#include <glib.h>
+#include <glib-object.h>
+#include <gio/gio.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+G_BEGIN_DECLS
+
+#define POWERD_TYPE_NETLINK            (powerd_netlink_get_type ())
+#define POWERD_NETLINK(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), POWERD_TYPE_NETLINK, PowerdNetlink))
+#define POWERD_IS_NETLINK(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), POWERD_TYPE_NETLINK))
+#define POWERD_NETLINK_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), POWERD_TYPE_NETLINK, PowerdNetlinkClass))
+#define POWERD_IS_NETLINK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), POWERD_TYPE_NETLINK))
+#define POWERD_NETLINK_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), POWERD_TYPE_NETLINK, PowerdNetlinkClass))
+
+struct _PowerdNetlinkPrivate;
+
+typedef struct _PowerdNetlink         PowerdNetlink;
+typedef struct _PowerdNetlinkClass    PowerdNetlinkClass;
+typedef struct _PowerdNetlinkPrivate  PowerdNetlinkPrivate;
+
+struct _PowerdNetlinkClass {
+	GObjectClass parent_class;
+};
+
+struct _PowerdNetlink {
+	GObject parent;
+	PowerdNetlinkPrivate * priv;
+};
+
+GType powerd_netlink_get_type (void);
+
+void powerd_netlink_set_cb (PowerdNetlink *self, int cb);
+
+void powerd_netlink_make_generic (PowerdNetlink *self);
+
+gboolean powerd_netlink_set_type (PowerdNetlink *self, char *type);
+
+gboolean powerd_netlink_set_device_powersave (PowerdNetlink *self,
+                                              char *devname,
+                                              gboolean powersave);
+
+gboolean powerd_netlink_set_wifi_powersave (PowerdNetlink *self,
+                                            gboolean powersave);
+
+G_END_DECLS
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

=== modified file 'src/powerd.cpp'
--- src/powerd.cpp	2014-09-30 14:50:08 +0000
+++ src/powerd.cpp	2014-10-23 16:07:31 +0000
@@ -38,6 +38,7 @@
 #include <gio/gio.h>
 #include "powerd-internal.h"
 #include "powerd-object.h"
+#include "powerd-netlink.h"
 #include "powerd-dbus.h"
 #include "powerd-sensors.h"
 #include "device-config.h"
@@ -95,6 +96,8 @@
 static GDBusProxy *g_ofono_proxy;
 static GDBusProxy *g_unity_proxy;
 
+static PowerdNetlink *powerd_netlink;
+
 static struct power_module* _power_module;
 
 static void
@@ -402,6 +405,12 @@
     /* Init this first, data is used by other inits */
     device_config_init();
 
+    powerd_netlink = POWERD_NETLINK (g_object_new (POWERD_TYPE_NETLINK, NULL));
+    powerd_netlink_set_cb (powerd_netlink, 0);
+    powerd_netlink_make_generic (powerd_netlink);
+    powerd_netlink_set_type (powerd_netlink, "nl80211");
+    powerd_netlink_set_wifi_powersave (powerd_netlink, TRUE);
+
     libsuspend_init(0);
     powerd_info("libsuspend: detect module: %s.", libsuspend_getname());
     powerd_stats_init();