mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-13 22:25:03 +00:00
Code Issues Releases Wiki Activity

WAN: protect Cisco HDLC state changes with a spinlock.

Browse source 
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Krzysztof Halasa 2008-05-19 19:11:08 +02:00 committed by Jeff Garzik
parent 0178ec3d3e
commit aff26e2faa
1 changed files with 48 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
drivers/net/wan/hdlc_cisco.c
View file

@ -56,6 +56,7 @@ struct cisco_state {
cisco_proto settings; cisco_proto settings;
struct timer_list timer; struct timer_list timer;
spinlock_t lock;
unsigned long last_poll; unsigned long last_poll;
int up; int up;
int request_sent; int request_sent;
@ -158,6 +159,7 @@ static int cisco_rx(struct sk_buff *skb)
{ {
struct net_device *dev = skb->dev; struct net_device *dev = skb->dev;
hdlc_device *hdlc = dev_to_hdlc(dev); hdlc_device *hdlc = dev_to_hdlc(dev);
struct cisco_state *st = state(hdlc);
struct hdlc_header *data = (struct hdlc_header*)skb->data; struct hdlc_header *data = (struct hdlc_header*)skb->data;
struct cisco_packet *cisco_data; struct cisco_packet *cisco_data;
struct in_device *in_dev; struct in_device *in_dev;
@ -220,11 +222,12 @@ static int cisco_rx(struct sk_buff *skb)
goto rx_error; goto rx_error;
case CISCO_KEEPALIVE_REQ: case CISCO_KEEPALIVE_REQ:
state(hdlc)->rxseq = ntohl(cisco_data->par1); spin_lock(&st->lock);
if (state(hdlc)->request_sent && st->rxseq = ntohl(cisco_data->par1);
ntohl(cisco_data->par2) == state(hdlc)->txseq) { if (st->request_sent &&
state(hdlc)->last_poll = jiffies; ntohl(cisco_data->par2) == st->txseq) {
if (!state(hdlc)->up) { st->last_poll = jiffies;
if (!st->up) {
u32 sec, min, hrs, days; u32 sec, min, hrs, days;
sec = ntohl(cisco_data->time) / 1000; sec = ntohl(cisco_data->time) / 1000;
min = sec / 60; sec -= min * 60; min = sec / 60; sec -= min * 60;
@ -232,12 +235,12 @@ static int cisco_rx(struct sk_buff *skb)
days = hrs / 24; hrs -= days * 24; days = hrs / 24; hrs -= days * 24;
printk(KERN_INFO "%s: Link up (peer " printk(KERN_INFO "%s: Link up (peer "
"uptime %ud%uh%um%us)\n", "uptime %ud%uh%um%us)\n",
dev->name, days, hrs, dev->name, days, hrs, min, sec);
min, sec);
netif_dormant_off(dev); netif_dormant_off(dev);
state(hdlc)->up = 1; st->up = 1;
} }
} }
spin_unlock(&st->lock);
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
return NET_RX_SUCCESS; return NET_RX_SUCCESS;
@ -261,24 +264,25 @@ static void cisco_timer(unsigned long arg)
{ {
struct net_device *dev = (struct net_device *)arg; struct net_device *dev = (struct net_device *)arg;
hdlc_device *hdlc = dev_to_hdlc(dev); hdlc_device *hdlc = dev_to_hdlc(dev);
struct cisco_state *st = state(hdlc);
if (state(hdlc)->up && spin_lock(&st->lock);
time_after(jiffies, state(hdlc)->last_poll + if (st->up &&
state(hdlc)->settings.timeout * HZ)) { time_after(jiffies, st->last_poll + st->settings.timeout * HZ)) {
state(hdlc)->up = 0; st->up = 0;
printk(KERN_INFO "%s: Link down\n", dev->name); printk(KERN_INFO "%s: Link down\n", dev->name);
netif_dormant_on(dev); netif_dormant_on(dev);
} }
cisco_keepalive_send(dev, CISCO_KEEPALIVE_REQ, cisco_keepalive_send(dev, CISCO_KEEPALIVE_REQ, htonl(++st->txseq),
htonl(++state(hdlc)->txseq), htonl(st->rxseq));
htonl(state(hdlc)->rxseq)); st->request_sent = 1;
state(hdlc)->request_sent = 1; spin_unlock(&st->lock);
state(hdlc)->timer.expires = jiffies +
state(hdlc)->settings.interval * HZ; st->timer.expires = jiffies + st->settings.interval * HZ;
state(hdlc)->timer.function = cisco_timer; st->timer.function = cisco_timer;
state(hdlc)->timer.data = arg; st->timer.data = arg;
add_timer(&state(hdlc)->timer); add_timer(&st->timer);
} }
@ -286,15 +290,20 @@ static void cisco_timer(unsigned long arg)
static void cisco_start(struct net_device *dev) static void cisco_start(struct net_device *dev)
{ {
hdlc_device *hdlc = dev_to_hdlc(dev); hdlc_device *hdlc = dev_to_hdlc(dev);
state(hdlc)->up = 0; struct cisco_state *st = state(hdlc);
state(hdlc)->request_sent = 0; unsigned long flags;
state(hdlc)->txseq = state(hdlc)->rxseq = 0;
init_timer(&state(hdlc)->timer); spin_lock_irqsave(&st->lock, flags);
state(hdlc)->timer.expires = jiffies + HZ; /*First poll after 1s*/ st->up = 0;
state(hdlc)->timer.function = cisco_timer; st->request_sent = 0;
state(hdlc)->timer.data = (unsigned long)dev; st->txseq = st->rxseq = 0;
add_timer(&state(hdlc)->timer); spin_unlock_irqrestore(&st->lock, flags);
init_timer(&st->timer);
st->timer.expires = jiffies + HZ; /* First poll after 1 s */
st->timer.function = cisco_timer;
st->timer.data = (unsigned long)dev;
add_timer(&st->timer);
} }
@ -302,10 +311,16 @@ static void cisco_start(struct net_device *dev)
static void cisco_stop(struct net_device *dev) static void cisco_stop(struct net_device *dev)
{ {
hdlc_device *hdlc = dev_to_hdlc(dev); hdlc_device *hdlc = dev_to_hdlc(dev);
del_timer_sync(&state(hdlc)->timer); struct cisco_state *st = state(hdlc);
unsigned long flags;
del_timer_sync(&st->timer);
spin_lock_irqsave(&st->lock, flags);
netif_dormant_on(dev); netif_dormant_on(dev);
state(hdlc)->up = 0; st->up = 0;
state(hdlc)->request_sent = 0; st->request_sent = 0;
spin_unlock_irqrestore(&st->lock, flags);
} }
@ -367,6 +382,7 @@ static int cisco_ioctl(struct net_device *dev, struct ifreq *ifr)
return result; return result;
memcpy(&state(hdlc)->settings, &new_settings, size); memcpy(&state(hdlc)->settings, &new_settings, size);
spin_lock_init(&state(hdlc)->lock);
dev->hard_start_xmit = hdlc->xmit; dev->hard_start_xmit = hdlc->xmit;
dev->header_ops = &cisco_header_ops; dev->header_ops = &cisco_header_ops;
dev->type = ARPHRD_CISCO; dev->type = ARPHRD_CISCO;