mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 18:09:57 +00:00
![John Stultz](/assets/img/avatar_default.png)
In order to enable lockdep on seqcount/seqlock structures, we must explicitly initialize any locks. The u64_stats_sync structure, uses a seqcount, and thus we need to introduce a u64_stats_init() function and use it to initialize the structure. This unfortunately adds a lot of fairly trivial initialization code to a number of drivers. But the benefit of ensuring correctness makes this worth while. Because these changes are required for lockdep to be enabled, and the changes are quite trivial, I've not yet split this patch out into 30-some separate patches, as I figured it would be better to get the various maintainers thoughts on how to best merge this change along with the seqcount lockdep enablement. Feedback would be appreciated! Signed-off-by: John Stultz <john.stultz@linaro.org> Acked-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> Cc: "David S. Miller" <davem@davemloft.net> Cc: Eric Dumazet <eric.dumazet@gmail.com> Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> Cc: James Morris <jmorris@namei.org> Cc: Jesse Gross <jesse@nicira.com> Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Cc: "Michael S. Tsirkin" <mst@redhat.com> Cc: Mirko Lindner <mlindner@marvell.com> Cc: Patrick McHardy <kaber@trash.net> Cc: Roger Luethi <rl@hellgate.ch> Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Simon Horman <horms@verge.net.au> Cc: Stephen Hemminger <stephen@networkplumber.org> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Wensong Zhang <wensong@linux-vs.org> Cc: netdev@vger.kernel.org Link: http://lkml.kernel.org/r/1381186321-4906-2-git-send-email-john.stultz@linaro.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
189 lines
4 KiB
C
189 lines
4 KiB
C
#include <linux/module.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/netlink.h>
|
|
#include <net/net_namespace.h>
|
|
#include <linux/if_arp.h>
|
|
#include <net/rtnetlink.h>
|
|
|
|
struct pcpu_lstats {
|
|
u64 packets;
|
|
u64 bytes;
|
|
struct u64_stats_sync syncp;
|
|
};
|
|
|
|
static netdev_tx_t nlmon_xmit(struct sk_buff *skb, struct net_device *dev)
|
|
{
|
|
int len = skb->len;
|
|
struct pcpu_lstats *stats = this_cpu_ptr(dev->lstats);
|
|
|
|
u64_stats_update_begin(&stats->syncp);
|
|
stats->bytes += len;
|
|
stats->packets++;
|
|
u64_stats_update_end(&stats->syncp);
|
|
|
|
dev_kfree_skb(skb);
|
|
|
|
return NETDEV_TX_OK;
|
|
}
|
|
|
|
static int nlmon_is_valid_mtu(int new_mtu)
|
|
{
|
|
/* Note that in netlink we do not really have an upper limit. On
|
|
* default, we use NLMSG_GOODSIZE. Here at least we should make
|
|
* sure that it's at least the header size.
|
|
*/
|
|
return new_mtu >= (int) sizeof(struct nlmsghdr);
|
|
}
|
|
|
|
static int nlmon_change_mtu(struct net_device *dev, int new_mtu)
|
|
{
|
|
if (!nlmon_is_valid_mtu(new_mtu))
|
|
return -EINVAL;
|
|
|
|
dev->mtu = new_mtu;
|
|
return 0;
|
|
}
|
|
|
|
static int nlmon_dev_init(struct net_device *dev)
|
|
{
|
|
int i;
|
|
|
|
dev->lstats = alloc_percpu(struct pcpu_lstats);
|
|
|
|
for_each_possible_cpu(i) {
|
|
struct pcpu_lstats *nlmstats;
|
|
nlmstats = per_cpu_ptr(dev->lstats, i);
|
|
u64_stats_init(&nlmstats->syncp);
|
|
}
|
|
|
|
return dev->lstats == NULL ? -ENOMEM : 0;
|
|
}
|
|
|
|
static void nlmon_dev_uninit(struct net_device *dev)
|
|
{
|
|
free_percpu(dev->lstats);
|
|
}
|
|
|
|
struct nlmon {
|
|
struct netlink_tap nt;
|
|
};
|
|
|
|
static int nlmon_open(struct net_device *dev)
|
|
{
|
|
struct nlmon *nlmon = netdev_priv(dev);
|
|
|
|
nlmon->nt.dev = dev;
|
|
nlmon->nt.module = THIS_MODULE;
|
|
return netlink_add_tap(&nlmon->nt);
|
|
}
|
|
|
|
static int nlmon_close(struct net_device *dev)
|
|
{
|
|
struct nlmon *nlmon = netdev_priv(dev);
|
|
|
|
return netlink_remove_tap(&nlmon->nt);
|
|
}
|
|
|
|
static struct rtnl_link_stats64 *
|
|
nlmon_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
|
|
{
|
|
int i;
|
|
u64 bytes = 0, packets = 0;
|
|
|
|
for_each_possible_cpu(i) {
|
|
const struct pcpu_lstats *nl_stats;
|
|
u64 tbytes, tpackets;
|
|
unsigned int start;
|
|
|
|
nl_stats = per_cpu_ptr(dev->lstats, i);
|
|
|
|
do {
|
|
start = u64_stats_fetch_begin_bh(&nl_stats->syncp);
|
|
tbytes = nl_stats->bytes;
|
|
tpackets = nl_stats->packets;
|
|
} while (u64_stats_fetch_retry_bh(&nl_stats->syncp, start));
|
|
|
|
packets += tpackets;
|
|
bytes += tbytes;
|
|
}
|
|
|
|
stats->rx_packets = packets;
|
|
stats->tx_packets = 0;
|
|
|
|
stats->rx_bytes = bytes;
|
|
stats->tx_bytes = 0;
|
|
|
|
return stats;
|
|
}
|
|
|
|
static u32 always_on(struct net_device *dev)
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
static const struct ethtool_ops nlmon_ethtool_ops = {
|
|
.get_link = always_on,
|
|
};
|
|
|
|
static const struct net_device_ops nlmon_ops = {
|
|
.ndo_init = nlmon_dev_init,
|
|
.ndo_uninit = nlmon_dev_uninit,
|
|
.ndo_open = nlmon_open,
|
|
.ndo_stop = nlmon_close,
|
|
.ndo_start_xmit = nlmon_xmit,
|
|
.ndo_get_stats64 = nlmon_get_stats64,
|
|
.ndo_change_mtu = nlmon_change_mtu,
|
|
};
|
|
|
|
static void nlmon_setup(struct net_device *dev)
|
|
{
|
|
dev->type = ARPHRD_NETLINK;
|
|
dev->tx_queue_len = 0;
|
|
|
|
dev->netdev_ops = &nlmon_ops;
|
|
dev->ethtool_ops = &nlmon_ethtool_ops;
|
|
dev->destructor = free_netdev;
|
|
|
|
dev->features = NETIF_F_FRAGLIST | NETIF_F_HIGHDMA;
|
|
dev->flags = IFF_NOARP;
|
|
|
|
/* That's rather a softlimit here, which, of course,
|
|
* can be altered. Not a real MTU, but what is to be
|
|
* expected in most cases.
|
|
*/
|
|
dev->mtu = NLMSG_GOODSIZE;
|
|
}
|
|
|
|
static int nlmon_validate(struct nlattr *tb[], struct nlattr *data[])
|
|
{
|
|
if (tb[IFLA_ADDRESS])
|
|
return -EINVAL;
|
|
return 0;
|
|
}
|
|
|
|
static struct rtnl_link_ops nlmon_link_ops __read_mostly = {
|
|
.kind = "nlmon",
|
|
.priv_size = sizeof(struct nlmon),
|
|
.setup = nlmon_setup,
|
|
.validate = nlmon_validate,
|
|
};
|
|
|
|
static __init int nlmon_register(void)
|
|
{
|
|
return rtnl_link_register(&nlmon_link_ops);
|
|
}
|
|
|
|
static __exit void nlmon_unregister(void)
|
|
{
|
|
rtnl_link_unregister(&nlmon_link_ops);
|
|
}
|
|
|
|
module_init(nlmon_register);
|
|
module_exit(nlmon_unregister);
|
|
|
|
MODULE_LICENSE("GPL v2");
|
|
MODULE_AUTHOR("Daniel Borkmann <dborkman@redhat.com>");
|
|
MODULE_AUTHOR("Mathieu Geli <geli@enseirb.fr>");
|
|
MODULE_DESCRIPTION("Netlink monitoring device");
|
|
MODULE_ALIAS_RTNL_LINK("nlmon");
|