mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-18 22:14:16 +00:00
Make struct pernet_operations::id unsigned.
There are 2 reasons to do so:
1)
This field is really an index into an zero based array and
thus is unsigned entity. Using negative value is out-of-bound
access by definition.
2)
On x86_64 unsigned 32-bit data which are mixed with pointers
via array indexing or offsets added or subtracted to pointers
are preffered to signed 32-bit data.
"int" being used as an array index needs to be sign-extended
to 64-bit before being used.
void f(long *p, int i)
{
g(p[i]);
}
roughly translates to
movsx rsi, esi
mov rdi, [rsi+...]
call g
MOVSX is 3 byte instruction which isn't necessary if the variable is
unsigned because x86_64 is zero extending by default.
Now, there is net_generic() function which, you guessed it right, uses
"int" as an array index:
static inline void *net_generic(const struct net *net, int id)
{
...
ptr = ng->ptr[id - 1];
...
}
And this function is used a lot, so those sign extensions add up.
Patch snipes ~1730 bytes on allyesconfig kernel (without all junk
messing with code generation):
add/remove: 0/0 grow/shrink: 70/598 up/down: 396/-2126 (-1730)
Unfortunately some functions actually grow bigger.
This is a semmingly random artefact of code generation with register
allocator being used differently. gcc decides that some variable
needs to live in new r8+ registers and every access now requires REX
prefix. Or it is shifted into r12, so [r12+0] addressing mode has to be
used which is longer than [r8]
However, overall balance is in negative direction:
add/remove: 0/0 grow/shrink: 70/598 up/down: 396/-2126 (-1730)
function old new delta
nfsd4_lock 3886 3959 +73
tipc_link_build_proto_msg 1096 1140 +44
mac80211_hwsim_new_radio 2776 2808 +32
tipc_mon_rcv 1032 1058 +26
svcauth_gss_legacy_init 1413 1429 +16
tipc_bcbase_select_primary 379 392 +13
nfsd4_exchange_id 1247 1260 +13
nfsd4_setclientid_confirm 782 793 +11
...
put_client_renew_locked 494 480 -14
ip_set_sockfn_get 730 716 -14
geneve_sock_add 829 813 -16
nfsd4_sequence_done 721 703 -18
nlmclnt_lookup_host 708 686 -22
nfsd4_lockt 1085 1063 -22
nfs_get_client 1077 1050 -27
tcf_bpf_init 1106 1076 -30
nfsd4_encode_fattr 5997 5930 -67
Total: Before=154856051, After=154854321, chg -0.00%
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
431 lines
9.9 KiB
C
431 lines
9.9 KiB
C
/*
|
|
* File: pn_dev.c
|
|
*
|
|
* Phonet network device
|
|
*
|
|
* Copyright (C) 2008 Nokia Corporation.
|
|
*
|
|
* Authors: Sakari Ailus <sakari.ailus@nokia.com>
|
|
* Rémi Denis-Courmont
|
|
*
|
|
* 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 St, Fifth Floor, Boston, MA
|
|
* 02110-1301 USA
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/net.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/phonet.h>
|
|
#include <linux/proc_fs.h>
|
|
#include <linux/if_arp.h>
|
|
#include <net/sock.h>
|
|
#include <net/netns/generic.h>
|
|
#include <net/phonet/pn_dev.h>
|
|
|
|
struct phonet_routes {
|
|
struct mutex lock;
|
|
struct net_device __rcu *table[64];
|
|
};
|
|
|
|
struct phonet_net {
|
|
struct phonet_device_list pndevs;
|
|
struct phonet_routes routes;
|
|
};
|
|
|
|
static unsigned int phonet_net_id __read_mostly;
|
|
|
|
static struct phonet_net *phonet_pernet(struct net *net)
|
|
{
|
|
BUG_ON(!net);
|
|
|
|
return net_generic(net, phonet_net_id);
|
|
}
|
|
|
|
struct phonet_device_list *phonet_device_list(struct net *net)
|
|
{
|
|
struct phonet_net *pnn = phonet_pernet(net);
|
|
return &pnn->pndevs;
|
|
}
|
|
|
|
/* Allocate new Phonet device. */
|
|
static struct phonet_device *__phonet_device_alloc(struct net_device *dev)
|
|
{
|
|
struct phonet_device_list *pndevs = phonet_device_list(dev_net(dev));
|
|
struct phonet_device *pnd = kmalloc(sizeof(*pnd), GFP_ATOMIC);
|
|
if (pnd == NULL)
|
|
return NULL;
|
|
pnd->netdev = dev;
|
|
bitmap_zero(pnd->addrs, 64);
|
|
|
|
BUG_ON(!mutex_is_locked(&pndevs->lock));
|
|
list_add_rcu(&pnd->list, &pndevs->list);
|
|
return pnd;
|
|
}
|
|
|
|
static struct phonet_device *__phonet_get(struct net_device *dev)
|
|
{
|
|
struct phonet_device_list *pndevs = phonet_device_list(dev_net(dev));
|
|
struct phonet_device *pnd;
|
|
|
|
BUG_ON(!mutex_is_locked(&pndevs->lock));
|
|
list_for_each_entry(pnd, &pndevs->list, list) {
|
|
if (pnd->netdev == dev)
|
|
return pnd;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
static struct phonet_device *__phonet_get_rcu(struct net_device *dev)
|
|
{
|
|
struct phonet_device_list *pndevs = phonet_device_list(dev_net(dev));
|
|
struct phonet_device *pnd;
|
|
|
|
list_for_each_entry_rcu(pnd, &pndevs->list, list) {
|
|
if (pnd->netdev == dev)
|
|
return pnd;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
static void phonet_device_destroy(struct net_device *dev)
|
|
{
|
|
struct phonet_device_list *pndevs = phonet_device_list(dev_net(dev));
|
|
struct phonet_device *pnd;
|
|
|
|
ASSERT_RTNL();
|
|
|
|
mutex_lock(&pndevs->lock);
|
|
pnd = __phonet_get(dev);
|
|
if (pnd)
|
|
list_del_rcu(&pnd->list);
|
|
mutex_unlock(&pndevs->lock);
|
|
|
|
if (pnd) {
|
|
u8 addr;
|
|
|
|
for_each_set_bit(addr, pnd->addrs, 64)
|
|
phonet_address_notify(RTM_DELADDR, dev, addr);
|
|
kfree(pnd);
|
|
}
|
|
}
|
|
|
|
struct net_device *phonet_device_get(struct net *net)
|
|
{
|
|
struct phonet_device_list *pndevs = phonet_device_list(net);
|
|
struct phonet_device *pnd;
|
|
struct net_device *dev = NULL;
|
|
|
|
rcu_read_lock();
|
|
list_for_each_entry_rcu(pnd, &pndevs->list, list) {
|
|
dev = pnd->netdev;
|
|
BUG_ON(!dev);
|
|
|
|
if ((dev->reg_state == NETREG_REGISTERED) &&
|
|
((pnd->netdev->flags & IFF_UP)) == IFF_UP)
|
|
break;
|
|
dev = NULL;
|
|
}
|
|
if (dev)
|
|
dev_hold(dev);
|
|
rcu_read_unlock();
|
|
return dev;
|
|
}
|
|
|
|
int phonet_address_add(struct net_device *dev, u8 addr)
|
|
{
|
|
struct phonet_device_list *pndevs = phonet_device_list(dev_net(dev));
|
|
struct phonet_device *pnd;
|
|
int err = 0;
|
|
|
|
mutex_lock(&pndevs->lock);
|
|
/* Find or create Phonet-specific device data */
|
|
pnd = __phonet_get(dev);
|
|
if (pnd == NULL)
|
|
pnd = __phonet_device_alloc(dev);
|
|
if (unlikely(pnd == NULL))
|
|
err = -ENOMEM;
|
|
else if (test_and_set_bit(addr >> 2, pnd->addrs))
|
|
err = -EEXIST;
|
|
mutex_unlock(&pndevs->lock);
|
|
return err;
|
|
}
|
|
|
|
int phonet_address_del(struct net_device *dev, u8 addr)
|
|
{
|
|
struct phonet_device_list *pndevs = phonet_device_list(dev_net(dev));
|
|
struct phonet_device *pnd;
|
|
int err = 0;
|
|
|
|
mutex_lock(&pndevs->lock);
|
|
pnd = __phonet_get(dev);
|
|
if (!pnd || !test_and_clear_bit(addr >> 2, pnd->addrs)) {
|
|
err = -EADDRNOTAVAIL;
|
|
pnd = NULL;
|
|
} else if (bitmap_empty(pnd->addrs, 64))
|
|
list_del_rcu(&pnd->list);
|
|
else
|
|
pnd = NULL;
|
|
mutex_unlock(&pndevs->lock);
|
|
|
|
if (pnd)
|
|
kfree_rcu(pnd, rcu);
|
|
|
|
return err;
|
|
}
|
|
|
|
/* Gets a source address toward a destination, through a interface. */
|
|
u8 phonet_address_get(struct net_device *dev, u8 daddr)
|
|
{
|
|
struct phonet_device *pnd;
|
|
u8 saddr;
|
|
|
|
rcu_read_lock();
|
|
pnd = __phonet_get_rcu(dev);
|
|
if (pnd) {
|
|
BUG_ON(bitmap_empty(pnd->addrs, 64));
|
|
|
|
/* Use same source address as destination, if possible */
|
|
if (test_bit(daddr >> 2, pnd->addrs))
|
|
saddr = daddr;
|
|
else
|
|
saddr = find_first_bit(pnd->addrs, 64) << 2;
|
|
} else
|
|
saddr = PN_NO_ADDR;
|
|
rcu_read_unlock();
|
|
|
|
if (saddr == PN_NO_ADDR) {
|
|
/* Fallback to another device */
|
|
struct net_device *def_dev;
|
|
|
|
def_dev = phonet_device_get(dev_net(dev));
|
|
if (def_dev) {
|
|
if (def_dev != dev)
|
|
saddr = phonet_address_get(def_dev, daddr);
|
|
dev_put(def_dev);
|
|
}
|
|
}
|
|
return saddr;
|
|
}
|
|
|
|
int phonet_address_lookup(struct net *net, u8 addr)
|
|
{
|
|
struct phonet_device_list *pndevs = phonet_device_list(net);
|
|
struct phonet_device *pnd;
|
|
int err = -EADDRNOTAVAIL;
|
|
|
|
rcu_read_lock();
|
|
list_for_each_entry_rcu(pnd, &pndevs->list, list) {
|
|
/* Don't allow unregistering devices! */
|
|
if ((pnd->netdev->reg_state != NETREG_REGISTERED) ||
|
|
((pnd->netdev->flags & IFF_UP)) != IFF_UP)
|
|
continue;
|
|
|
|
if (test_bit(addr >> 2, pnd->addrs)) {
|
|
err = 0;
|
|
goto found;
|
|
}
|
|
}
|
|
found:
|
|
rcu_read_unlock();
|
|
return err;
|
|
}
|
|
|
|
/* automatically configure a Phonet device, if supported */
|
|
static int phonet_device_autoconf(struct net_device *dev)
|
|
{
|
|
struct if_phonet_req req;
|
|
int ret;
|
|
|
|
if (!dev->netdev_ops->ndo_do_ioctl)
|
|
return -EOPNOTSUPP;
|
|
|
|
ret = dev->netdev_ops->ndo_do_ioctl(dev, (struct ifreq *)&req,
|
|
SIOCPNGAUTOCONF);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
ASSERT_RTNL();
|
|
ret = phonet_address_add(dev, req.ifr_phonet_autoconf.device);
|
|
if (ret)
|
|
return ret;
|
|
phonet_address_notify(RTM_NEWADDR, dev,
|
|
req.ifr_phonet_autoconf.device);
|
|
return 0;
|
|
}
|
|
|
|
static void phonet_route_autodel(struct net_device *dev)
|
|
{
|
|
struct phonet_net *pnn = phonet_pernet(dev_net(dev));
|
|
unsigned int i;
|
|
DECLARE_BITMAP(deleted, 64);
|
|
|
|
/* Remove left-over Phonet routes */
|
|
bitmap_zero(deleted, 64);
|
|
mutex_lock(&pnn->routes.lock);
|
|
for (i = 0; i < 64; i++)
|
|
if (rcu_access_pointer(pnn->routes.table[i]) == dev) {
|
|
RCU_INIT_POINTER(pnn->routes.table[i], NULL);
|
|
set_bit(i, deleted);
|
|
}
|
|
mutex_unlock(&pnn->routes.lock);
|
|
|
|
if (bitmap_empty(deleted, 64))
|
|
return; /* short-circuit RCU */
|
|
synchronize_rcu();
|
|
for_each_set_bit(i, deleted, 64) {
|
|
rtm_phonet_notify(RTM_DELROUTE, dev, i);
|
|
dev_put(dev);
|
|
}
|
|
}
|
|
|
|
/* notify Phonet of device events */
|
|
static int phonet_device_notify(struct notifier_block *me, unsigned long what,
|
|
void *ptr)
|
|
{
|
|
struct net_device *dev = netdev_notifier_info_to_dev(ptr);
|
|
|
|
switch (what) {
|
|
case NETDEV_REGISTER:
|
|
if (dev->type == ARPHRD_PHONET)
|
|
phonet_device_autoconf(dev);
|
|
break;
|
|
case NETDEV_UNREGISTER:
|
|
phonet_device_destroy(dev);
|
|
phonet_route_autodel(dev);
|
|
break;
|
|
}
|
|
return 0;
|
|
|
|
}
|
|
|
|
static struct notifier_block phonet_device_notifier = {
|
|
.notifier_call = phonet_device_notify,
|
|
.priority = 0,
|
|
};
|
|
|
|
/* Per-namespace Phonet devices handling */
|
|
static int __net_init phonet_init_net(struct net *net)
|
|
{
|
|
struct phonet_net *pnn = phonet_pernet(net);
|
|
|
|
if (!proc_create("phonet", 0, net->proc_net, &pn_sock_seq_fops))
|
|
return -ENOMEM;
|
|
|
|
INIT_LIST_HEAD(&pnn->pndevs.list);
|
|
mutex_init(&pnn->pndevs.lock);
|
|
mutex_init(&pnn->routes.lock);
|
|
return 0;
|
|
}
|
|
|
|
static void __net_exit phonet_exit_net(struct net *net)
|
|
{
|
|
remove_proc_entry("phonet", net->proc_net);
|
|
}
|
|
|
|
static struct pernet_operations phonet_net_ops = {
|
|
.init = phonet_init_net,
|
|
.exit = phonet_exit_net,
|
|
.id = &phonet_net_id,
|
|
.size = sizeof(struct phonet_net),
|
|
};
|
|
|
|
/* Initialize Phonet devices list */
|
|
int __init phonet_device_init(void)
|
|
{
|
|
int err = register_pernet_subsys(&phonet_net_ops);
|
|
if (err)
|
|
return err;
|
|
|
|
proc_create("pnresource", 0, init_net.proc_net, &pn_res_seq_fops);
|
|
register_netdevice_notifier(&phonet_device_notifier);
|
|
err = phonet_netlink_register();
|
|
if (err)
|
|
phonet_device_exit();
|
|
return err;
|
|
}
|
|
|
|
void phonet_device_exit(void)
|
|
{
|
|
rtnl_unregister_all(PF_PHONET);
|
|
unregister_netdevice_notifier(&phonet_device_notifier);
|
|
unregister_pernet_subsys(&phonet_net_ops);
|
|
remove_proc_entry("pnresource", init_net.proc_net);
|
|
}
|
|
|
|
int phonet_route_add(struct net_device *dev, u8 daddr)
|
|
{
|
|
struct phonet_net *pnn = phonet_pernet(dev_net(dev));
|
|
struct phonet_routes *routes = &pnn->routes;
|
|
int err = -EEXIST;
|
|
|
|
daddr = daddr >> 2;
|
|
mutex_lock(&routes->lock);
|
|
if (routes->table[daddr] == NULL) {
|
|
rcu_assign_pointer(routes->table[daddr], dev);
|
|
dev_hold(dev);
|
|
err = 0;
|
|
}
|
|
mutex_unlock(&routes->lock);
|
|
return err;
|
|
}
|
|
|
|
int phonet_route_del(struct net_device *dev, u8 daddr)
|
|
{
|
|
struct phonet_net *pnn = phonet_pernet(dev_net(dev));
|
|
struct phonet_routes *routes = &pnn->routes;
|
|
|
|
daddr = daddr >> 2;
|
|
mutex_lock(&routes->lock);
|
|
if (rcu_access_pointer(routes->table[daddr]) == dev)
|
|
RCU_INIT_POINTER(routes->table[daddr], NULL);
|
|
else
|
|
dev = NULL;
|
|
mutex_unlock(&routes->lock);
|
|
|
|
if (!dev)
|
|
return -ENOENT;
|
|
synchronize_rcu();
|
|
dev_put(dev);
|
|
return 0;
|
|
}
|
|
|
|
struct net_device *phonet_route_get_rcu(struct net *net, u8 daddr)
|
|
{
|
|
struct phonet_net *pnn = phonet_pernet(net);
|
|
struct phonet_routes *routes = &pnn->routes;
|
|
struct net_device *dev;
|
|
|
|
daddr >>= 2;
|
|
dev = rcu_dereference(routes->table[daddr]);
|
|
return dev;
|
|
}
|
|
|
|
struct net_device *phonet_route_output(struct net *net, u8 daddr)
|
|
{
|
|
struct phonet_net *pnn = phonet_pernet(net);
|
|
struct phonet_routes *routes = &pnn->routes;
|
|
struct net_device *dev;
|
|
|
|
daddr >>= 2;
|
|
rcu_read_lock();
|
|
dev = rcu_dereference(routes->table[daddr]);
|
|
if (dev)
|
|
dev_hold(dev);
|
|
rcu_read_unlock();
|
|
|
|
if (!dev)
|
|
dev = phonet_device_get(net); /* Default route */
|
|
return dev;
|
|
}
|