mirror of
https://github.com/torvalds/linux.git
synced 2024-11-27 06:31:52 +00:00
5a0e3ad6af
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
346 lines
7.4 KiB
C
346 lines
7.4 KiB
C
/*
|
|
* Netlink inteface for IEEE 802.15.4 stack
|
|
*
|
|
* Copyright 2007, 2008 Siemens AG
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2
|
|
* as published by the Free Software Foundation.
|
|
*
|
|
* This program 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, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*
|
|
* Written by:
|
|
* Sergey Lapin <slapin@ossfans.org>
|
|
* Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
|
|
* Maxim Osipov <maxim.osipov@siemens.com>
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/slab.h>
|
|
#include <net/netlink.h>
|
|
#include <net/genetlink.h>
|
|
#include <net/wpan-phy.h>
|
|
#include <net/af_ieee802154.h>
|
|
#include <net/ieee802154_netdev.h>
|
|
#include <net/rtnetlink.h> /* for rtnl_{un,}lock */
|
|
#include <linux/nl802154.h>
|
|
|
|
#include "ieee802154.h"
|
|
|
|
static int ieee802154_nl_fill_phy(struct sk_buff *msg, u32 pid,
|
|
u32 seq, int flags, struct wpan_phy *phy)
|
|
{
|
|
void *hdr;
|
|
int i, pages = 0;
|
|
uint32_t *buf = kzalloc(32 * sizeof(uint32_t), GFP_KERNEL);
|
|
|
|
pr_debug("%s\n", __func__);
|
|
|
|
if (!buf)
|
|
goto out;
|
|
|
|
hdr = genlmsg_put(msg, 0, seq, &nl802154_family, flags,
|
|
IEEE802154_LIST_PHY);
|
|
if (!hdr)
|
|
goto out;
|
|
|
|
mutex_lock(&phy->pib_lock);
|
|
NLA_PUT_STRING(msg, IEEE802154_ATTR_PHY_NAME, wpan_phy_name(phy));
|
|
|
|
NLA_PUT_U8(msg, IEEE802154_ATTR_PAGE, phy->current_page);
|
|
NLA_PUT_U8(msg, IEEE802154_ATTR_CHANNEL, phy->current_channel);
|
|
for (i = 0; i < 32; i++) {
|
|
if (phy->channels_supported[i])
|
|
buf[pages++] = phy->channels_supported[i] | (i << 27);
|
|
}
|
|
if (pages)
|
|
NLA_PUT(msg, IEEE802154_ATTR_CHANNEL_PAGE_LIST,
|
|
pages * sizeof(uint32_t), buf);
|
|
|
|
mutex_unlock(&phy->pib_lock);
|
|
return genlmsg_end(msg, hdr);
|
|
|
|
nla_put_failure:
|
|
mutex_unlock(&phy->pib_lock);
|
|
genlmsg_cancel(msg, hdr);
|
|
out:
|
|
kfree(buf);
|
|
return -EMSGSIZE;
|
|
}
|
|
|
|
static int ieee802154_list_phy(struct sk_buff *skb,
|
|
struct genl_info *info)
|
|
{
|
|
/* Request for interface name, index, type, IEEE address,
|
|
PAN Id, short address */
|
|
struct sk_buff *msg;
|
|
struct wpan_phy *phy;
|
|
const char *name;
|
|
int rc = -ENOBUFS;
|
|
|
|
pr_debug("%s\n", __func__);
|
|
|
|
if (!info->attrs[IEEE802154_ATTR_PHY_NAME])
|
|
return -EINVAL;
|
|
|
|
name = nla_data(info->attrs[IEEE802154_ATTR_PHY_NAME]);
|
|
if (name[nla_len(info->attrs[IEEE802154_ATTR_PHY_NAME]) - 1] != '\0')
|
|
return -EINVAL; /* phy name should be null-terminated */
|
|
|
|
|
|
phy = wpan_phy_find(name);
|
|
if (!phy)
|
|
return -ENODEV;
|
|
|
|
msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
|
|
if (!msg)
|
|
goto out_dev;
|
|
|
|
rc = ieee802154_nl_fill_phy(msg, info->snd_pid, info->snd_seq,
|
|
0, phy);
|
|
if (rc < 0)
|
|
goto out_free;
|
|
|
|
wpan_phy_put(phy);
|
|
|
|
return genlmsg_reply(msg, info);
|
|
out_free:
|
|
nlmsg_free(msg);
|
|
out_dev:
|
|
wpan_phy_put(phy);
|
|
return rc;
|
|
|
|
}
|
|
|
|
struct dump_phy_data {
|
|
struct sk_buff *skb;
|
|
struct netlink_callback *cb;
|
|
int idx, s_idx;
|
|
};
|
|
|
|
static int ieee802154_dump_phy_iter(struct wpan_phy *phy, void *_data)
|
|
{
|
|
int rc;
|
|
struct dump_phy_data *data = _data;
|
|
|
|
pr_debug("%s\n", __func__);
|
|
|
|
if (data->idx++ < data->s_idx)
|
|
return 0;
|
|
|
|
rc = ieee802154_nl_fill_phy(data->skb,
|
|
NETLINK_CB(data->cb->skb).pid,
|
|
data->cb->nlh->nlmsg_seq,
|
|
NLM_F_MULTI,
|
|
phy);
|
|
|
|
if (rc < 0) {
|
|
data->idx--;
|
|
return rc;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ieee802154_dump_phy(struct sk_buff *skb,
|
|
struct netlink_callback *cb)
|
|
{
|
|
struct dump_phy_data data = {
|
|
.cb = cb,
|
|
.skb = skb,
|
|
.s_idx = cb->args[0],
|
|
.idx = 0,
|
|
};
|
|
|
|
pr_debug("%s\n", __func__);
|
|
|
|
wpan_phy_for_each(ieee802154_dump_phy_iter, &data);
|
|
|
|
cb->args[0] = data.idx;
|
|
|
|
return skb->len;
|
|
}
|
|
|
|
static int ieee802154_add_iface(struct sk_buff *skb,
|
|
struct genl_info *info)
|
|
{
|
|
struct sk_buff *msg;
|
|
struct wpan_phy *phy;
|
|
const char *name;
|
|
const char *devname;
|
|
int rc = -ENOBUFS;
|
|
struct net_device *dev;
|
|
|
|
pr_debug("%s\n", __func__);
|
|
|
|
if (!info->attrs[IEEE802154_ATTR_PHY_NAME])
|
|
return -EINVAL;
|
|
|
|
name = nla_data(info->attrs[IEEE802154_ATTR_PHY_NAME]);
|
|
if (name[nla_len(info->attrs[IEEE802154_ATTR_PHY_NAME]) - 1] != '\0')
|
|
return -EINVAL; /* phy name should be null-terminated */
|
|
|
|
if (info->attrs[IEEE802154_ATTR_DEV_NAME]) {
|
|
devname = nla_data(info->attrs[IEEE802154_ATTR_DEV_NAME]);
|
|
if (devname[nla_len(info->attrs[IEEE802154_ATTR_DEV_NAME]) - 1]
|
|
!= '\0')
|
|
return -EINVAL; /* phy name should be null-terminated */
|
|
} else {
|
|
devname = "wpan%d";
|
|
}
|
|
|
|
if (strlen(devname) >= IFNAMSIZ)
|
|
return -ENAMETOOLONG;
|
|
|
|
phy = wpan_phy_find(name);
|
|
if (!phy)
|
|
return -ENODEV;
|
|
|
|
msg = ieee802154_nl_new_reply(info, 0, IEEE802154_ADD_IFACE);
|
|
if (!msg)
|
|
goto out_dev;
|
|
|
|
if (!phy->add_iface) {
|
|
rc = -EINVAL;
|
|
goto nla_put_failure;
|
|
}
|
|
|
|
dev = phy->add_iface(phy, devname);
|
|
if (IS_ERR(dev)) {
|
|
rc = PTR_ERR(dev);
|
|
goto nla_put_failure;
|
|
}
|
|
|
|
NLA_PUT_STRING(msg, IEEE802154_ATTR_PHY_NAME, wpan_phy_name(phy));
|
|
NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name);
|
|
|
|
dev_put(dev);
|
|
|
|
wpan_phy_put(phy);
|
|
|
|
return ieee802154_nl_reply(msg, info);
|
|
|
|
nla_put_failure:
|
|
nlmsg_free(msg);
|
|
out_dev:
|
|
wpan_phy_put(phy);
|
|
return rc;
|
|
}
|
|
|
|
static int ieee802154_del_iface(struct sk_buff *skb,
|
|
struct genl_info *info)
|
|
{
|
|
struct sk_buff *msg;
|
|
struct wpan_phy *phy;
|
|
const char *name;
|
|
int rc;
|
|
struct net_device *dev;
|
|
|
|
pr_debug("%s\n", __func__);
|
|
|
|
if (!info->attrs[IEEE802154_ATTR_DEV_NAME])
|
|
return -EINVAL;
|
|
|
|
name = nla_data(info->attrs[IEEE802154_ATTR_DEV_NAME]);
|
|
if (name[nla_len(info->attrs[IEEE802154_ATTR_DEV_NAME]) - 1] != '\0')
|
|
return -EINVAL; /* name should be null-terminated */
|
|
|
|
dev = dev_get_by_name(genl_info_net(info), name);
|
|
if (!dev)
|
|
return -ENODEV;
|
|
|
|
phy = ieee802154_mlme_ops(dev)->get_phy(dev);
|
|
BUG_ON(!phy);
|
|
|
|
rc = -EINVAL;
|
|
/* phy name is optional, but should be checked if it's given */
|
|
if (info->attrs[IEEE802154_ATTR_PHY_NAME]) {
|
|
struct wpan_phy *phy2;
|
|
|
|
const char *pname =
|
|
nla_data(info->attrs[IEEE802154_ATTR_PHY_NAME]);
|
|
if (pname[nla_len(info->attrs[IEEE802154_ATTR_PHY_NAME]) - 1]
|
|
!= '\0')
|
|
/* name should be null-terminated */
|
|
goto out_dev;
|
|
|
|
phy2 = wpan_phy_find(pname);
|
|
if (!phy2)
|
|
goto out_dev;
|
|
|
|
if (phy != phy2) {
|
|
wpan_phy_put(phy2);
|
|
goto out_dev;
|
|
}
|
|
}
|
|
|
|
rc = -ENOBUFS;
|
|
|
|
msg = ieee802154_nl_new_reply(info, 0, IEEE802154_DEL_IFACE);
|
|
if (!msg)
|
|
goto out_dev;
|
|
|
|
if (!phy->del_iface) {
|
|
rc = -EINVAL;
|
|
goto nla_put_failure;
|
|
}
|
|
|
|
rtnl_lock();
|
|
phy->del_iface(phy, dev);
|
|
|
|
/* We don't have device anymore */
|
|
dev_put(dev);
|
|
dev = NULL;
|
|
|
|
rtnl_unlock();
|
|
|
|
|
|
NLA_PUT_STRING(msg, IEEE802154_ATTR_PHY_NAME, wpan_phy_name(phy));
|
|
NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, name);
|
|
|
|
wpan_phy_put(phy);
|
|
|
|
return ieee802154_nl_reply(msg, info);
|
|
|
|
nla_put_failure:
|
|
nlmsg_free(msg);
|
|
out_dev:
|
|
wpan_phy_put(phy);
|
|
if (dev)
|
|
dev_put(dev);
|
|
|
|
return rc;
|
|
}
|
|
|
|
static struct genl_ops ieee802154_phy_ops[] = {
|
|
IEEE802154_DUMP(IEEE802154_LIST_PHY, ieee802154_list_phy,
|
|
ieee802154_dump_phy),
|
|
IEEE802154_OP(IEEE802154_ADD_IFACE, ieee802154_add_iface),
|
|
IEEE802154_OP(IEEE802154_DEL_IFACE, ieee802154_del_iface),
|
|
};
|
|
|
|
/*
|
|
* No need to unregister as family unregistration will do it.
|
|
*/
|
|
int nl802154_phy_register(void)
|
|
{
|
|
int i;
|
|
int rc;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(ieee802154_phy_ops); i++) {
|
|
rc = genl_register_ops(&nl802154_family,
|
|
&ieee802154_phy_ops[i]);
|
|
if (rc)
|
|
return rc;
|
|
}
|
|
|
|
return 0;
|
|
}
|