From patchwork Thu Jul 22 10:41:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 59560 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 36A4CB70C8 for ; Thu, 22 Jul 2010 20:42:00 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755768Ab0GVKl4 (ORCPT ); Thu, 22 Jul 2010 06:41:56 -0400 Received: from he.sipsolutions.net ([78.46.109.217]:60488 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755400Ab0GVKlz (ORCPT ); Thu, 22 Jul 2010 06:41:55 -0400 Received: by sipsolutions.net with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1ObtCy-0004vR-6d; Thu, 22 Jul 2010 12:40:56 +0200 Subject: Re: [PATCH] sysfs: Don't allow the creation of symlinks we can't remove From: Johannes Berg To: "Eric W. Biederman" Cc: Greg KH , Andrew Morton , "Rafael J. Wysocki" , "Maciej W. Rozycki" , Kay Sievers , Greg KH , netdev In-Reply-To: References: <20100621150826.762ac9f2.akpm@linux-foundation.org> <20100621222938.GA20583@suse.de> <20100621231058.GA1066@suse.de> <20100622035631.GA3755@suse.de> <1279792459.12439.0.camel@jlt3.sipsolutions.net> <1279793435.12439.3.camel@jlt3.sipsolutions.net> Date: Thu, 22 Jul 2010 12:41:26 +0200 Message-ID: <1279795286.12439.8.camel@jlt3.sipsolutions.net> Mime-Version: 1.0 X-Mailer: Evolution 2.30.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Thu, 2010-07-22 at 03:35 -0700, Eric W. Biederman wrote: > >> The warning patch just makes things fail faster. Although I get some of the > >> wireless interfaces for hwsim when I use this one. > > > > Hmm, I didn't. > > To be clear I just get hwsim0. Not wlan0 or wlan1. Ah, yes, but that's just a regular netdev, you can pretty much ignore it. It just shows all hwsim traffic as it is on the "air" for sniffing. > > Right, it actually starts working again with that patch you sent. > > However, netns support is really broken: > > > > > > Do we have a convenient command line tool to do this? > I remember there being a different netlink message from > normal network devices. iw phy0 set netns http://git.sipsolutions.net/iw.git > > root@kvm:~# ip link > > 3: wlan0: mtu 1500 qdisc noop state DOWN qlen 1000 > > link/ether 02:00:00:00:00:00 brd ff:ff:ff:ff:ff:ff > > 7: lo: mtu 16436 qdisc noop state DOWN > > link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00 > > root@kvm:~# ls /sys/class/net/ > > eth0 hwsim0 lo wlan1 wlan2 > > I think this is actually the output of something working. > > I expect after you created a new netns you didn't mount > a new instance of /sys. /sys remembers which netns you > had when you mounted it. So you have to mount /sys again > so you can see the /sys/class/net for the network namespace > you are in. Ohh, oops! I saw all the "current->" references in the code and somehow expected the same instance of sysfs to show the right thing. Yes, it works now. But the patch below doesn't seem to work, am I missing something? johannes --- include/linux/netdevice.h | 2 ++ net/core/net-sysfs.c | 3 ++- net/wireless/sysfs.c | 9 +++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- wireless-testing.orig/include/linux/netdevice.h 2010-07-22 10:01:22.000000000 +0200 +++ wireless-testing/include/linux/netdevice.h 2010-07-22 10:11:00.000000000 +0200 @@ -2148,6 +2148,8 @@ extern void dev_seq_stop(struct seq_file extern int netdev_class_create_file(struct class_attribute *class_attr); extern void netdev_class_remove_file(struct class_attribute *class_attr); +extern struct kobj_ns_type_operations net_ns_type_operations; + extern char *netdev_drivername(const struct net_device *dev, char *buffer, int len); extern void linkwatch_run_queue(void); --- wireless-testing.orig/net/core/net-sysfs.c 2010-07-22 10:01:22.000000000 +0200 +++ wireless-testing/net/core/net-sysfs.c 2010-07-22 10:11:51.000000000 +0200 @@ -785,12 +785,13 @@ static const void *net_netlink_ns(struct return sock_net(sk); } -static struct kobj_ns_type_operations net_ns_type_operations = { +struct kobj_ns_type_operations net_ns_type_operations = { .type = KOBJ_NS_TYPE_NET, .current_ns = net_current_ns, .netlink_ns = net_netlink_ns, .initial_ns = net_initial_ns, }; +EXPORT_SYMBOL_GPL(net_ns_type_operations); static void net_kobj_ns_exit(struct net *net) { --- wireless-testing.orig/net/wireless/sysfs.c 2010-07-22 10:01:22.000000000 +0200 +++ wireless-testing/net/wireless/sysfs.c 2010-07-22 10:13:08.000000000 +0200 @@ -110,6 +110,13 @@ static int wiphy_resume(struct device *d return ret; } +static const void *wiphy_namespace(struct device *d) +{ + struct wiphy *wiphy = container_of(d, struct wiphy, dev); + + return wiphy_net(wiphy); +} + struct class ieee80211_class = { .name = "ieee80211", .owner = THIS_MODULE, @@ -120,6 +127,8 @@ struct class ieee80211_class = { #endif .suspend = wiphy_suspend, .resume = wiphy_resume, + .ns_type = &net_ns_type_operations, + .namespace = wiphy_namespace, }; int wiphy_sysfs_init(void)