cfg80211/mac80211: use debugfs_remove_recursive
Subsystems (2)
Johannes Berg
maintainerPATCH 1/1 cfg80211/mac80211: use debugfs_remove_recursive
We can save a lot of code and pointers in the structs by using debugfs_remove_recursive().
First, change cfg80211 to use debugfs_remove_recursive() so that drivers do not need to clean up any files they added to the per-wiphy debugfs (if and only if they are ok to be accessed until after wiphy_unregister!).
Then also make mac80211 use debugfs_remove_recursive() where necessary -- it need not remove per-wiphy files as cfg80211 now removes those, but netdev etc. files still need to be handled but can now be removed without needing struct dentry pointers to all of them.
---
This doesn't necessarily have to be one patch, but the cfg80211 bit is small ... let me know if you'd prefer two patches.
net/mac80211/debugfs.c | 73 ----------------- net/mac80211/debugfs.h | 2 net/mac80211/debugfs_key.c | 44 +++------- net/mac80211/debugfs_netdev.c | 174 ++++++------------------------------------ net/mac80211/debugfs_sta.c | 31 ------- net/mac80211/ieee80211_i.h | 114 --------------------------- net/mac80211/key.h | 12 -- net/mac80211/main.c | 2 net/mac80211/rate.c | 7 - net/mac80211/sta_info.h | 22 ----- net/wireless/core.c | 3 net/wireless/core.h | 11 -- net/wireless/debugfs.c | 15 --- net/wireless/debugfs.h | 3 14 files changed, 51 insertions(+), 462 deletions(-)
net/mac80211/debugfs_sta.c +2 -29
@@ -158,13 +158,9 @@ static ssize_t sta_agg_status_read(strucSTA_OPS (agg_status);#define DEBUGFS_ADD (name) \ - sta->debugfs.name = debugfs_create_file(#name, 0400, \ + debugfs_create_file(#name, 0400, \ sta->debugfs.dir, sta, &sta_ ##name## _ops); -#define DEBUGFS_DEL (name) \ - debugfs_remove(sta->debugfs.name);\ - sta->debugfs.name = NULL; -void ieee80211_sta_debugfs_add (struct sta_info *sta) {
@@ -216,29 +212,6 @@ void ieee80211_sta_debugfs_add(struct stvoid ieee80211_sta_debugfs_remove (struct sta_info *sta) { -DEBUGFS_DEL (flags); -DEBUGFS_DEL (num_ps_buf_frames); -DEBUGFS_DEL (inactive_ms); -DEBUGFS_DEL (last_seq_ctrl); -DEBUGFS_DEL (agg_status); -DEBUGFS_DEL (aid); -DEBUGFS_DEL (dev); -DEBUGFS_DEL (rx_packets); -DEBUGFS_DEL (tx_packets); -DEBUGFS_DEL (rx_bytes); -DEBUGFS_DEL (tx_bytes); -DEBUGFS_DEL (rx_duplicates); -DEBUGFS_DEL (rx_fragments); -DEBUGFS_DEL (rx_dropped); -DEBUGFS_DEL (tx_fragments); -DEBUGFS_DEL (tx_filtered); -DEBUGFS_DEL (tx_retry_failed); -DEBUGFS_DEL (tx_retry_count); -DEBUGFS_DEL (last_signal); -DEBUGFS_DEL (last_qual); -DEBUGFS_DEL (last_noise); -DEBUGFS_DEL (wep_weak_iv_count); - -debugfs_remove (sta->debugfs.dir); +debugfs_remove_recursive (sta->debugfs.dir); sta->debugfs.dir =NULL ; }
net/mac80211/ieee80211_i.h +2 -112
129 lines not on this page · raw message
net/mac80211/key.h +0 -12
@@ -118,18 +118,6 @@ struct ieee80211_key {struct {struct dentry *stalink;struct dentry *dir; -struct dentry *keylen; -struct dentry *flags; -struct dentry *keyidx; -struct dentry *hw_key_idx; -struct dentry *tx_rx_count; -struct dentry *algorithm; -struct dentry *tx_spec; -struct dentry *rx_spec; -struct dentry *replays; -struct dentry *icverrors; -struct dentry *key; -struct dentry *ifindex;int cnt; } debugfs;#endif
net/mac80211/rate.c +2 -5
@@ -163,8 +163,7 @@ struct rate_control_ref *rate_control_al#ifdef CONFIG_MAC80211_DEBUGFS debugfsdir =debugfs_create_dir ("rc" , local->hw.wiphy->debugfsdir); local->debugfs.rcdir = debugfsdir; - local->debugfs.rcname =debugfs_create_file ("name" ,0400 , debugfsdir, - ref, &rcname_ops); +debugfs_create_file ("name" ,0400 , debugfsdir, ref, &rcname_ops);#endif ref->priv = ref->ops->alloc (&local->hw, debugfsdir);
@@ -188,9 +187,7 @@ static void rate_control_release(struct ctrl_ref->ops->free (ctrl_ref->priv);#ifdef CONFIG_MAC80211_DEBUGFS -debugfs_remove (ctrl_ref->local->debugfs.rcname); - ctrl_ref->local->debugfs.rcname =NULL ; -debugfs_remove (ctrl_ref->local->debugfs.rcdir); +debugfs_remove_recursive (ctrl_ref->local->debugfs.rcdir); ctrl_ref->local->debugfs.rcdir =NULL ;#endif
net/mac80211/sta_info.h +0 -22
@@ -301,28 +301,6 @@ struct sta_info {#ifdef CONFIG_MAC80211_DEBUGFS struct sta_info_debugfsdentries {struct dentry *dir; -struct dentry *flags; -struct dentry *num_ps_buf_frames; -struct dentry *inactive_ms; -struct dentry *last_seq_ctrl; -struct dentry *agg_status; -struct dentry *aid; -struct dentry *dev; -struct dentry *rx_packets; -struct dentry *tx_packets; -struct dentry *rx_bytes; -struct dentry *tx_bytes; -struct dentry *rx_duplicates; -struct dentry *rx_fragments; -struct dentry *rx_dropped; -struct dentry *tx_fragments; -struct dentry *tx_filtered; -struct dentry *tx_retry_failed; -struct dentry *tx_retry_count; -struct dentry *last_signal; -struct dentry *last_qual; -struct dentry *last_noise; -struct dentry *wep_weak_iv_count;bool add_has_run; } debugfs;#endif
net/mac80211/debugfs.c +4 -69
99 lines not on this page · raw message
net/mac80211/debugfs_netdev.c +26 -148
234 lines not on this page · raw message
net/mac80211/debugfs_key.c +13 -31
99 lines not on this page · raw message
net/wireless/core.c +1 -2
@@ -547,7 +547,7 @@ void wiphy_unregister(struct wiphy *wiph* First remove the hardware from everywhere, this makes * it impossible to find from userspace. */ -cfg80211_debugfs_rdev_del (rdev); +debugfs_remove_recursive (rdev->wiphy.debugfsdir);list_del (&rdev->list);/*
@@ -570,7 +570,6 @@ void wiphy_unregister(struct wiphy *wiph cfg80211_rdev_list_generation++;device_del (&rdev->wiphy.dev); -debugfs_remove (rdev->wiphy.debugfsdir);mutex_unlock (&cfg80211_mutex);
net/mac80211/debugfs.h +0 -2
@@ -3,14 +3,12 @@#ifdef CONFIG_MAC80211_DEBUGFS extern void debugfs_hw_add (struct ieee80211_local *local); -extern void debugfs_hw_del (struct ieee80211_local *local);extern int mac80211_open_file_generic (struct inode *inode,struct file *file);#else static inline void debugfs_hw_add (struct ieee80211_local *local) {return ; } -static inline void debugfs_hw_del (struct ieee80211_local *local) {}#endif #endif /* __MAC80211_DEBUGFS_H */
net/mac80211/main.c +0 -2
@@ -923,7 +923,6 @@ int ieee80211_register_hw(struct ieee802 fail_wep:sta_info_stop (local); fail_sta_info: -debugfs_hw_del (local);destroy_workqueue (local->workqueue); fail_workqueue:wiphy_unregister (local->hw.wiphy);
@@ -959,7 +958,6 @@ void ieee80211_unregister_hw(struct ieeeieee80211_clear_tx_pending (local);sta_info_stop (local);rate_control_deinitialize (local); -debugfs_hw_del (local);if (skb_queue_len (&local->skb_queue) ||skb_queue_len (&local->skb_queue_unreliable))
net/wireless/core.h +0 -11
@@ -72,17 +72,6 @@ struct cfg80211_registered_device {/* current channel */ struct ieee80211_channel *channel; -#ifdef CONFIG_CFG80211_DEBUGFS -/* Debugfs entries */ -struct wiphy_debugfsdentries { -struct dentry *rts_threshold; -struct dentry *fragmentation_threshold; -struct dentry *short_retry_limit; -struct dentry *long_retry_limit; -struct dentry *ht40allow_map; - } debugfs; -#endif -/* must be last because of the way we do wiphy_priv(), * and it should at least be aligned to NETDEV_ALIGN */ struct wiphy wiphy __attribute__((__aligned__(NETDEV_ALIGN)));
net/wireless/debugfs.c +1 -14
@@ -104,11 +104,7 @@ static const struct file_operations ht40 };#define DEBUGFS_ADD (name) \ - rdev->debugfs.name = debugfs_create_file(#name, S_IRUGO, phyd, \ - &rdev->wiphy, &name## _ops); -#define DEBUGFS_DEL (name) \ - debugfs_remove(rdev->debugfs.name); \ - rdev->debugfs.name = NULL; + debugfs_create_file(#name, S_IRUGO, phyd, &rdev->wiphy, &name## _ops);void cfg80211_debugfs_rdev_add (struct cfg80211_registered_device *rdev) {
@@ -120,12 +116,3 @@ void cfg80211_debugfs_rdev_add(struct cfDEBUGFS_ADD (long_retry_limit);DEBUGFS_ADD (ht40allow_map); } - -void cfg80211_debugfs_rdev_del (struct cfg80211_registered_device *rdev) -{ -DEBUGFS_DEL (rts_threshold); -DEBUGFS_DEL (fragmentation_threshold); -DEBUGFS_DEL (short_retry_limit); -DEBUGFS_DEL (long_retry_limit); -DEBUGFS_DEL (ht40allow_map); -}
net/wireless/debugfs.h +0 -3
@@ -3,12 +3,9 @@#ifdef CONFIG_CFG80211_DEBUGFS void cfg80211_debugfs_rdev_add (struct cfg80211_registered_device *rdev); -void cfg80211_debugfs_rdev_del (struct cfg80211_registered_device *rdev);#else static inline void cfg80211_debugfs_rdev_add (struct cfg80211_registered_device *rdev) {} -static inline -void cfg80211_debugfs_rdev_del (struct cfg80211_registered_device *rdev) {}#endif #endif /* __CFG80211_DEBUGFS_H */