a8779ec1c5
The gfp parameter was added in: commit47be03a28cAuthor: Amerigo Wang <amwang@redhat.com> Date: Fri Aug 10 01:24:37 2012 +0000 netpoll: use GFP_ATOMIC in slave_enable_netpoll() and __netpoll_setup() slave_enable_netpoll() and __netpoll_setup() may be called with read_lock() held, so should use GFP_ATOMIC to allocate memory. Eric suggested to pass gfp flags to __netpoll_setup(). Cc: Eric Dumazet <eric.dumazet@gmail.com> Cc: "David S. Miller" <davem@davemloft.net> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: Cong Wang <amwang@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> The reason for the gfp parameter was removed in: commitc4cdef9b71Author: dingtianhong <dingtianhong@huawei.com> Date: Tue Jul 23 15:25:27 2013 +0800 bonding: don't call slave_xxx_netpoll under spinlocks The slave_xxx_netpoll will call synchronize_rcu_bh(), so the function may schedule and sleep, it should't be called under spinlocks. bond_netpoll_setup() and bond_netpoll_cleanup() are always protected by rtnl lock, it is no need to take the read lock, as the slave list couldn't be changed outside rtnl lock. Signed-off-by: Ding Tianhong <dingtianhong@huawei.com> Cc: Jay Vosburgh <fubar@us.ibm.com> Cc: Andy Gospodarek <andy@greyhouse.net> Signed-off-by: David S. Miller <davem@davemloft.net> Nothing else that calls __netpoll_setup or ndo_netpoll_setup requires a gfp paramter, so remove the gfp parameter from both of these functions making the code clearer. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
120 lines
2.6 KiB
C
120 lines
2.6 KiB
C
/*
|
|
* Common code for low-level network console, dump, and debugger code
|
|
*
|
|
* Derived from netconsole, kgdb-over-ethernet, and netdump patches
|
|
*/
|
|
|
|
#ifndef _LINUX_NETPOLL_H
|
|
#define _LINUX_NETPOLL_H
|
|
|
|
#include <linux/netdevice.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/rcupdate.h>
|
|
#include <linux/list.h>
|
|
|
|
union inet_addr {
|
|
__u32 all[4];
|
|
__be32 ip;
|
|
__be32 ip6[4];
|
|
struct in_addr in;
|
|
struct in6_addr in6;
|
|
};
|
|
|
|
struct netpoll {
|
|
struct net_device *dev;
|
|
char dev_name[IFNAMSIZ];
|
|
const char *name;
|
|
|
|
union inet_addr local_ip, remote_ip;
|
|
bool ipv6;
|
|
u16 local_port, remote_port;
|
|
u8 remote_mac[ETH_ALEN];
|
|
|
|
struct work_struct cleanup_work;
|
|
};
|
|
|
|
struct netpoll_info {
|
|
atomic_t refcnt;
|
|
|
|
struct semaphore dev_lock;
|
|
|
|
struct sk_buff_head txq;
|
|
|
|
struct delayed_work tx_work;
|
|
|
|
struct netpoll *netpoll;
|
|
struct rcu_head rcu;
|
|
};
|
|
|
|
#ifdef CONFIG_NETPOLL
|
|
extern void netpoll_rx_disable(struct net_device *dev);
|
|
extern void netpoll_rx_enable(struct net_device *dev);
|
|
#else
|
|
static inline void netpoll_rx_disable(struct net_device *dev) { return; }
|
|
static inline void netpoll_rx_enable(struct net_device *dev) { return; }
|
|
#endif
|
|
|
|
void netpoll_send_udp(struct netpoll *np, const char *msg, int len);
|
|
void netpoll_print_options(struct netpoll *np);
|
|
int netpoll_parse_options(struct netpoll *np, char *opt);
|
|
int __netpoll_setup(struct netpoll *np, struct net_device *ndev);
|
|
int netpoll_setup(struct netpoll *np);
|
|
void __netpoll_cleanup(struct netpoll *np);
|
|
void __netpoll_free_async(struct netpoll *np);
|
|
void netpoll_cleanup(struct netpoll *np);
|
|
void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
|
|
struct net_device *dev);
|
|
static inline void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
|
|
{
|
|
unsigned long flags;
|
|
local_irq_save(flags);
|
|
netpoll_send_skb_on_dev(np, skb, np->dev);
|
|
local_irq_restore(flags);
|
|
}
|
|
|
|
#ifdef CONFIG_NETPOLL
|
|
static inline void *netpoll_poll_lock(struct napi_struct *napi)
|
|
{
|
|
struct net_device *dev = napi->dev;
|
|
|
|
if (dev && dev->npinfo) {
|
|
spin_lock(&napi->poll_lock);
|
|
napi->poll_owner = smp_processor_id();
|
|
return napi;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
static inline void netpoll_poll_unlock(void *have)
|
|
{
|
|
struct napi_struct *napi = have;
|
|
|
|
if (napi) {
|
|
napi->poll_owner = -1;
|
|
spin_unlock(&napi->poll_lock);
|
|
}
|
|
}
|
|
|
|
static inline bool netpoll_tx_running(struct net_device *dev)
|
|
{
|
|
return irqs_disabled();
|
|
}
|
|
|
|
#else
|
|
static inline void *netpoll_poll_lock(struct napi_struct *napi)
|
|
{
|
|
return NULL;
|
|
}
|
|
static inline void netpoll_poll_unlock(void *have)
|
|
{
|
|
}
|
|
static inline void netpoll_netdev_init(struct net_device *dev)
|
|
{
|
|
}
|
|
static inline bool netpoll_tx_running(struct net_device *dev)
|
|
{
|
|
return false;
|
|
}
|
|
#endif
|
|
|
|
#endif
|