Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[TOKENRING]: Use interrupt-safe locking with rif_lock.

Browse source 
Change operations on rif_lock from spin_{un}lock_bh to
spin_{un}lock_irq{save,restore} equivalents.  Some of the
rif_lock critical sections are called from interrupt context via
tr_type_trans->tr_add_rif_info.  The TR NIC drivers call tr_type_trans
from their packet receive handlers.

Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jay Vosburgh 2005-08-18 14:04:51 -07:00 committed by David S. Miller
parent 6be382ea0c
commit 001dd250c1
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
net/802/tr.c
View file

@ -251,10 +251,11 @@ void tr_source_route(struct sk_buff *skb,struct trh_hdr *trh,struct net_device *
unsigned int hash; unsigned int hash;
struct rif_cache *entry; struct rif_cache *entry;
unsigned char *olddata; unsigned char *olddata;
unsigned long flags;
static const unsigned char mcast_func_addr[] static const unsigned char mcast_func_addr[]
= {0xC0,0x00,0x00,0x04,0x00,0x00}; = {0xC0,0x00,0x00,0x04,0x00,0x00};
spin_lock_bh(&rif_lock); spin_lock_irqsave(&rif_lock, flags);
/* /*
* Broadcasts are single route as stated in RFC 1042 * Broadcasts are single route as stated in RFC 1042
@ -323,7 +324,7 @@ printk("source routing for %02X:%02X:%02X:%02X:%02X:%02X\n",trh->daddr[0],
else else
slack = 18 - ((ntohs(trh->rcf) & TR_RCF_LEN_MASK)>>8); slack = 18 - ((ntohs(trh->rcf) & TR_RCF_LEN_MASK)>>8);
olddata = skb->data; olddata = skb->data;
spin_unlock_bh(&rif_lock); spin_unlock_irqrestore(&rif_lock, flags);
skb_pull(skb, slack); skb_pull(skb, slack);
memmove(skb->data, olddata, sizeof(struct trh_hdr) - slack); memmove(skb->data, olddata, sizeof(struct trh_hdr) - slack);
@ -337,10 +338,11 @@ printk("source routing for %02X:%02X:%02X:%02X:%02X:%02X\n",trh->daddr[0],
static void tr_add_rif_info(struct trh_hdr *trh, struct net_device *dev) static void tr_add_rif_info(struct trh_hdr *trh, struct net_device *dev)
{ {
unsigned int hash, rii_p = 0; unsigned int hash, rii_p = 0;
unsigned long flags;
struct rif_cache *entry; struct rif_cache *entry;
spin_lock_bh(&rif_lock); spin_lock_irqsave(&rif_lock, flags);
/* /*
* Firstly see if the entry exists * Firstly see if the entry exists
@ -378,7 +380,7 @@ printk("adding rif_entry: addr:%02X:%02X:%02X:%02X:%02X:%02X rcf:%04X\n",
if(!entry) if(!entry)
{ {
printk(KERN_DEBUG "tr.c: Couldn't malloc rif cache entry !\n"); printk(KERN_DEBUG "tr.c: Couldn't malloc rif cache entry !\n");
spin_unlock_bh(&rif_lock); spin_unlock_irqrestore(&rif_lock, flags);
return; return;
} }
@ -420,7 +422,7 @@ printk("updating rif_entry: addr:%02X:%02X:%02X:%02X:%02X:%02X rcf:%04X\n",
} }
entry->last_used=jiffies; entry->last_used=jiffies;
} }
spin_unlock_bh(&rif_lock); spin_unlock_irqrestore(&rif_lock, flags);
} }
/* /*
@ -430,9 +432,9 @@ printk("updating rif_entry: addr:%02X:%02X:%02X:%02X:%02X:%02X rcf:%04X\n",
static void rif_check_expire(unsigned long dummy) static void rif_check_expire(unsigned long dummy)
{ {
int i; int i;
unsigned long next_interval = jiffies + sysctl_tr_rif_timeout/2; unsigned long flags, next_interval = jiffies + sysctl_tr_rif_timeout/2;
spin_lock_bh(&rif_lock); spin_lock_irqsave(&rif_lock, flags);
for(i =0; i < RIF_TABLE_SIZE; i++) { for(i =0; i < RIF_TABLE_SIZE; i++) {
struct rif_cache *entry, **pentry; struct rif_cache *entry, **pentry;
@ -454,7 +456,7 @@ static void rif_check_expire(unsigned long dummy)
} }
} }
spin_unlock_bh(&rif_lock); spin_unlock_irqrestore(&rif_lock, flags);
mod_timer(&rif_timer, next_interval); mod_timer(&rif_timer, next_interval);
@ -485,7 +487,7 @@ static struct rif_cache *rif_get_idx(loff_t pos)
static void *rif_seq_start(struct seq_file *seq, loff_t *pos) static void *rif_seq_start(struct seq_file *seq, loff_t *pos)
{ {
spin_lock_bh(&rif_lock); spin_lock_irq(&rif_lock);
return *pos ? rif_get_idx(*pos - 1) : SEQ_START_TOKEN; return *pos ? rif_get_idx(*pos - 1) : SEQ_START_TOKEN;
} }
@ -516,7 +518,7 @@ static void *rif_seq_next(struct seq_file *seq, void *v, loff_t *pos)
static void rif_seq_stop(struct seq_file *seq, void *v) static void rif_seq_stop(struct seq_file *seq, void *v)
{ {
spin_unlock_bh(&rif_lock); spin_unlock_irq(&rif_lock);
} }
static int rif_seq_show(struct seq_file *seq, void *v) static int rif_seq_show(struct seq_file *seq, void *v)