NET: Fix locking issues in PPP, 6pack, mkiss and strip line disciplines.
Subsystems (3)
Guido Trentalancia reports:
I am trying to use the kiss driver in the Linux kernel that is being shipped with Fedora 10 but unfortunately I get the following oops:
mkiss: AX.25 Multikiss, Hans Albas PE1AYX
mkiss: ax0: crc mode is auto.ADDRCONF(NETDEV_CHANGE): ax0: link becomes ready
------------[ cut here ]------------ WARNING: at kernel/softirq.c:77 __local_bh_disable+0x2f/0x83() (Not
tainted)
[...]
unloaded: microcode]
Pid: 0, comm: swapper Not tainted 2.6.27.25-170.2.72.fc10.i686 #1
[<c042ddfb>] warn_on_slowpath+0x65/0x8b [<c06ab62b>] ? _spin_unlock_irqrestore+0x22/0x38 [<c04228b4>] ? __enqueue_entity+0xe3/0xeb [<c042431e>] ? enqueue_entity+0x203/0x20b [<c0424361>] ? enqueue_task_fair+0x3b/0x3f [<c041f88c>] ? resched_task+0x3a/0x6e [<c06ab62b>] ? _spin_unlock_irqrestore+0x22/0x38 [<c06ab4e2>] ? _spin_lock_bh+0xb/0x16 [<c043255b>] __local_bh_disable+0x2f/0x83 [<c04325ba>] local_bh_disable+0xb/0xd [<c06ab4e2>] _spin_lock_bh+0xb/0x16 [<f8b6f600>] mkiss_receive_buf+0x2fb/0x3a6 [mkiss] [<c0572a30>] flush_to_ldisc+0xf7/0x198 [<c0572b12>] tty_flip_buffer_push+0x41/0x51 [<f89477f2>] ftdi_process_read+0x375/0x4ad [ftdi_sio] [<f8947a5a>] ftdi_read_bulk_callback+0x130/0x138 [ftdi_sio] [<c05d4bec>] usb_hcd_giveback_urb+0x63/0x93 [<c05ea290>] uhci_giveback_urb+0xe5/0x15f [<c05eaabf>] uhci_scan_schedule+0x52e/0x767 [<c05f6288>] ? psmouse_handle_byte+0xc/0xe5 [<c054df78>] ? acpi_ev_gpe_detect+0xd6/0xe1 [<c05ec5b0>] uhci_irq+0x110/0x125 [<c05d4834>] usb_hcd_irq+0x40/0xa3 [<c0465313>] handle_IRQ_event+0x2f/0x64 [<c046642b>] handle_level_irq+0x74/0xbe [<c04663b7>] ? handle_level_irq+0x0/0xbe [<c0406e6e>] do_IRQ+0xc7/0xfe [<c0405668>] common_interrupt+0x28/0x30 [<c056821a>] ? acpi_idle_enter_simple+0x162/0x19d [<c0617f52>] cpuidle_idle_call+0x60/0x92 [<c0403c61>] cpu_idle+0x101/0x134 [<c069b1ba>] rest_init+0x4e/0x50 ======================= ---[ end trace b7cc8076093467ad ]--- ------------[ cut here ]------------ WARNING: at kernel/softirq.c:136 _local_bh_enable_ip+0x3d/0xc4() [...] Pid: 0, comm: swapper Tainted: G W 2.6.27.25-170.2.72.fc10.i686 [<c042ddfb>] warn_on_slowpath+0x65/0x8b [<c06ab62b>] ? _spin_unlock_irqrestore+0x22/0x38 [<c04228b4>] ? __enqueue_entity+0xe3/0xeb [<c042431e>] ? enqueue_entity+0x203/0x20b [<c0424361>] ? enqueue_task_fair+0x3b/0x3f [<c041f88c>] ? resched_task+0x3a/0x6e [<c06ab62b>] ? _spin_unlock_irqrestore+0x22/0x38 [<c06ab4e2>] ? _spin_lock_bh+0xb/0x16 [<f8b6f642>] ? mkiss_receive_buf+0x33d/0x3a6 [mkiss] [<c04325f9>] _local_bh_enable_ip+0x3d/0xc4 [<c0432688>] local_bh_enable_ip+0x8/0xa [<c06ab54d>] _spin_unlock_bh+0x11/0x13 [<f8b6f642>] mkiss_receive_buf+0x33d/0x3a6 [mkiss] [<c0572a30>] flush_to_ldisc+0xf7/0x198 [<c0572b12>] tty_flip_buffer_push+0x41/0x51 [<f89477f2>] ftdi_process_read+0x375/0x4ad [ftdi_sio] [<f8947a5a>] ftdi_read_bulk_callback+0x130/0x138 [ftdi_sio] [<c05d4bec>] usb_hcd_giveback_urb+0x63/0x93 [<c05ea290>] uhci_giveback_urb+0xe5/0x15f [<c05eaabf>] uhci_scan_schedule+0x52e/0x767 [<c05f6288>] ? psmouse_handle_byte+0xc/0xe5 [<c054df78>] ? acpi_ev_gpe_detect+0xd6/0xe1 [<c05ec5b0>] uhci_irq+0x110/0x125 [<c05d4834>] usb_hcd_irq+0x40/0xa3 [<c0465313>] handle_IRQ_event+0x2f/0x64 [<c046642b>] handle_level_irq+0x74/0xbe [<c04663b7>] ? handle_level_irq+0x0/0xbe [<c0406e6e>] do_IRQ+0xc7/0xfe [<c0405668>] common_interrupt+0x28/0x30 [<c056821a>] ? acpi_idle_enter_simple+0x162/0x19d [<c0617f52>] cpuidle_idle_call+0x60/0x92 [<c0403c61>] cpu_idle+0x101/0x134 [<c069b1ba>] rest_init+0x4e/0x50 ======================= ---[ end trace b7cc8076093467ad ]---
mkiss: ax0: Trying crc-smack
mkiss: ax0: Trying crc-flexnet
The issue was, that the locking code in mkiss was assuming it was only ever being called in process or bh context but some tty drivers such as the USB serial driver may call it in interrupt context. Fixed by converting the involved locking code to use irq-safe locks.
Review of similar networking line disciplines shows that 6pack, both sync
and async PPP and STRIP have similar issues. The PPP ones are the most
interesting ones as half of the issue was sorted out as far back as 2004
in commit http://git.kernel.org/?p=linux/kernel/git/tglx/history.git;a=commitdiff;h=2996d8deaeddd01820691a872550dc0cfba0c37d
--- drivers/net/hamradio/6pack.c | 10 ++++++---- drivers/net/hamradio/mkiss.c | 15 +++++++++------ drivers/net/ppp_async.c | 11 +++++++---- drivers/net/ppp_synctty.c | 11 +++++++---- drivers/net/wireless/strip.c | 39 ++++++++++++++++++++++++--------------- 5 files changed, 53 insertions(+), 33 deletions(-)
drivers/net/hamradio/6pack.c +6 -4
@@ -398,13 +398,14 @@ static DEFINE_RWLOCK(disc_data_lock);static struct sixpack *sp_get (struct tty_struct *tty) { +unsigned long flags;struct sixpack *sp; -read_lock (&disc_data_lock); +read_lock_irqsave (&disc_data_lock, flags); sp = tty->disc_data;if (sp)atomic_inc (&sp->refcnt); -read_unlock (&disc_data_lock); +read_unlock_irqrestore (&disc_data_lock, flags);return sp; }
@@ -688,12 +689,13 @@ out:*/ static void sixpack_close (struct tty_struct *tty) { +unsigned long flags;struct sixpack *sp; -write_lock (&disc_data_lock); +write_lock_irqsave (&disc_data_lock, flags); sp = tty->disc_data; tty->disc_data =NULL ; -write_unlock (&disc_data_lock); +write_unlock_irqrestore (&disc_data_lock, flags);if (!sp)return ;
drivers/net/hamradio/mkiss.c +9 -6
@@ -367,6 +367,7 @@ static void ax_changedmtu(struct mkiss *ax) {struct net_device *dev = ax->dev;unsigned char *xbuff, *rbuff, *oxbuff, *orbuff; +unsigned long flags;int len; len = dev->mtu *2 ;
@@ -392,7 +393,7 @@ static void ax_changedmtu(struct mkiss *ax)return ; } -spin_lock_bh (&ax->buflock); +spin_lock_irqsave (&ax->buflock, flags); oxbuff = ax->xbuff; ax->xbuff = xbuff;
@@ -423,7 +424,7 @@ static void ax_changedmtu(struct mkiss *ax) ax->mtu = dev->mtu +73 ; ax->buffsize = len; -spin_unlock_bh (&ax->buflock); +spin_unlock_irqrestore (&ax->buflock, flags);kfree (oxbuff);kfree (orbuff);
@@ -704,13 +705,14 @@ static DEFINE_RWLOCK(disc_data_lock);static struct mkiss *mkiss_get (struct tty_struct *tty) { +unsigned long flags;struct mkiss *ax; -read_lock (&disc_data_lock); +read_lock_irqsave (&disc_data_lock, flags); ax = tty->disc_data;if (ax)atomic_inc (&ax->refcnt); -read_unlock (&disc_data_lock); +read_unlock_irqrestore (&disc_data_lock, flags);return ax; }
@@ -809,12 +811,13 @@ out:static void mkiss_close (struct tty_struct *tty) { +unsigned long flags;struct mkiss *ax; -write_lock (&disc_data_lock); +write_lock_irqsave (&disc_data_lock, flags); ax = tty->disc_data; tty->disc_data =NULL ; -write_unlock (&disc_data_lock); +write_unlock_irqrestore (&disc_data_lock, flags);if (!ax)return ;
drivers/net/ppp_async.c +7 -4
@@ -132,13 +132,15 @@ static DEFINE_RWLOCK(disc_data_lock);static struct asyncppp *ap_get (struct tty_struct *tty) { +unsigned long flags;struct asyncppp *ap; -read_lock (&disc_data_lock); +read_lock_irqsave (&disc_data_lock, flags); ap = tty->disc_data;if (ap !=NULL )atomic_inc (&ap->refcnt); -read_unlock (&disc_data_lock); +read_unlock_irqrestore (&disc_data_lock, flags); +return ap; }
@@ -215,12 +217,13 @@ ppp_asynctty_open(struct tty_struct *tty)static void ppp_asynctty_close (struct tty_struct *tty) { +unsigned long flags;struct asyncppp *ap; -write_lock_irq (&disc_data_lock); +write_lock_irqsave (&disc_data_lock, flags); ap = tty->disc_data; tty->disc_data =NULL ; -write_unlock_irq (&disc_data_lock); +write_unlock_irqrestore (&disc_data_lock, flags);if (!ap)return ;
drivers/net/ppp_synctty.c +7 -4
@@ -182,13 +182,15 @@ static DEFINE_RWLOCK(disc_data_lock);static struct syncppp *sp_get (struct tty_struct *tty) { +unsigned long flags;struct syncppp *ap; -read_lock (&disc_data_lock); +read_lock_irqsave (&disc_data_lock, flags); ap = tty->disc_data;if (ap !=NULL )atomic_inc (&ap->refcnt); -read_unlock (&disc_data_lock); +read_unlock_irqrestore (&disc_data_lock, flags); +return ap; }
@@ -262,12 +264,13 @@ ppp_sync_open(struct tty_struct *tty)static void ppp_sync_close (struct tty_struct *tty) { +unsigned long flags;struct syncppp *ap; -write_lock_irq (&disc_data_lock); +write_lock_irqsave (&disc_data_lock, flags); ap = tty->disc_data; tty->disc_data =NULL ; -write_unlock_irq (&disc_data_lock); +write_unlock_irqrestore (&disc_data_lock, flags);if (!ap)return ;
drivers/net/wireless/strip.c +24 -15
@@ -856,6 +856,7 @@ static int strip_change_mtu(struct net_device *dev, int new_mtu)unsigned char *orbuff = strip_info->rx_buff;unsigned char *osbuff = strip_info->sx_buff;unsigned char *otbuff = strip_info->tx_buff; +unsigned long flags;if (new_mtu >MAX_SEND_MTU ) { printk(KERN_ERR
@@ -864,11 +865,11 @@ static int strip_change_mtu(struct net_device *dev, int new_mtu)return -EINVAL ; } -spin_lock_bh (&strip_lock); +spin_lock_irqsave (&strip_lock, flags);if (!allocate_buffers (strip_info, new_mtu)) {printk (KERN_ERR "%s: unable to grow strip buffers, MTU change cancelled.\n" , strip_info->dev->name); -spin_unlock_bh (&strip_lock); +spin_unlock_irqrestore (&strip_lock, flags);return -ENOMEM ; }
@@ -892,7 +893,7 @@ static int strip_change_mtu(struct net_device *dev, int new_mtu) } } strip_info->tx_head = strip_info->tx_buff; -spin_unlock_bh (&strip_lock); +spin_unlock_irqrestore (&strip_lock, flags);printk (KERN_NOTICE "%s: strip MTU changed fom %d to %d.\n" , strip_info->dev->name, old_mtu, strip_info->mtu);
@@ -983,10 +984,13 @@ static void strip_seq_neighbours(struct seq_file *seq,const MetricomNodeTable * table, const char *title) { -/* We wrap this in a do/while loop, so if the table changes */ -/* while we're reading it, we just go around and try again. */ + unsigned long flags;struct timeval t; +/* +* We wrap this in a do/while loop, so if the table changes +* while we're reading it, we just go around and try again. +*/ do { int i; t = table->timestamp;
@@ -995,9 +999,9 @@ static void strip_seq_neighbours(struct seq_file *seq,for (i =0 ; i < table->num_nodes; i++) {MetricomNode node; -spin_lock_bh (&strip_lock); +spin_lock_irqsave (&strip_lock, flags); node = table->node[i]; -spin_unlock_bh (&strip_lock); +spin_unlock_irqrestore (&strip_lock, flags);seq_printf (seq," %s\n" , node.c); } } while (table->timestamp.tv_sec != t.tv_sec
@@ -1536,6 +1540,7 @@ static void strip_send(struct strip *strip_info, struct sk_buff *skb)static int strip_xmit (struct sk_buff *skb,struct net_device *dev) {struct strip *strip_info =netdev_priv (dev); +unsigned long flags;if (!netif_running (dev)) { printk(KERN_ERR "%s: xmit call when iface is down\n",
@@ -1574,11 +1579,11 @@ static int strip_xmit(struct sk_buff *skb, struct net_device *dev) strip_info->dev->name, sx_pps_count / 8); } -spin_lock_bh (&strip_lock); +spin_lock_irqsave (&strip_lock, flags);strip_send (strip_info, skb); -spin_unlock_bh (&strip_lock); +spin_unlock_irqrestore (&strip_lock, flags);if (skb)dev_kfree_skb (skb);
@@ -2263,12 +2268,13 @@ static void strip_receive_buf(struct tty_struct *tty, const unsigned char *cp, {struct strip *strip_info = tty->disc_data;const unsigned char *end = cp + count; +unsigned long flags;if (!strip_info || strip_info->magic !=STRIP_MAGIC || !netif_running (strip_info->dev))return ; -spin_lock_bh (&strip_lock); +spin_lock_irqsave (&strip_lock, flags);#if 0 {struct timeval tv;
@@ -2335,7 +2341,7 @@ static void strip_receive_buf(struct tty_struct *tty, const unsigned char *cp, } cp++; } -spin_unlock_bh (&strip_lock); +spin_unlock_irqrestore (&strip_lock, flags); }
@@ -2523,9 +2529,11 @@ static void strip_dev_setup(struct net_device *dev)static void strip_free (struct strip *strip_info) { -spin_lock_bh (&strip_lock); +unsigned long flags; + +spin_lock_irqsave (&strip_lock, flags);list_del_rcu (&strip_info->list); -spin_unlock_bh (&strip_lock); +spin_unlock_irqrestore (&strip_lock, flags); strip_info->magic =0 ;
@@ -2539,6 +2547,7 @@ static void strip_free(struct strip *strip_info)static struct strip *strip_alloc (void ) {struct list_head *n; +unsigned long flags;struct net_device *dev;struct strip *strip_info;
@@ -2562,7 +2571,7 @@ static struct strip *strip_alloc(void) strip_info->idle_timer.function = strip_IdleTask; -spin_lock_bh (&strip_lock); +spin_lock_irqsave (&strip_lock, flags); rescan:/* * Search the list to find where to put our new entry
@@ -2581,7 +2590,7 @@ static struct strip *strip_alloc(void)sprintf (dev->name,"st%ld" , dev->base_addr);list_add_tail_rcu (&strip_info->list, &strip_list); -spin_unlock_bh (&strip_lock); +spin_unlock_irqrestore (&strip_lock, flags);return strip_info; }
PATCH 1/1 NET: Fix locking issues in PPP, 6pack, mkiss and strip line disciplines.
Guido Trentalancia reports:
I am trying to use the kiss driver in the Linux kernel that is being shipped with Fedora 10 but unfortunately I get the following oops:
mkiss: AX.25 Multikiss, Hans Albas PE1AYX
mkiss: ax0: crc mode is auto.ADDRCONF(NETDEV_CHANGE): ax0: link becomes ready
------------[ cut here ]------------ WARNING: at kernel/softirq.c:77 __local_bh_disable+0x2f/0x83() (Not
tainted)
[...]
unloaded: microcode]
Pid: 0, comm: swapper Not tainted 2.6.27.25-170.2.72.fc10.i686 #1
[<c042ddfb>] warn_on_slowpath+0x65/0x8b [<c06ab62b>] ? _spin_unlock_irqrestore+0x22/0x38 [<c04228b4>] ? __enqueue_entity+0xe3/0xeb [<c042431e>] ? enqueue_entity+0x203/0x20b [<c0424361>] ? enqueue_task_fair+0x3b/0x3f [<c041f88c>] ? resched_task+0x3a/0x6e [<c06ab62b>] ? _spin_unlock_irqrestore+0x22/0x38 [<c06ab4e2>] ? _spin_lock_bh+0xb/0x16 [<c043255b>] __local_bh_disable+0x2f/0x83 [<c04325ba>] local_bh_disable+0xb/0xd [<c06ab4e2>] _spin_lock_bh+0xb/0x16 [<f8b6f600>] mkiss_receive_buf+0x2fb/0x3a6 [mkiss] [<c0572a30>] flush_to_ldisc+0xf7/0x198 [<c0572b12>] tty_flip_buffer_push+0x41/0x51 [<f89477f2>] ftdi_process_read+0x375/0x4ad [ftdi_sio] [<f8947a5a>] ftdi_read_bulk_callback+0x130/0x138 [ftdi_sio] [<c05d4bec>] usb_hcd_giveback_urb+0x63/0x93 [<c05ea290>] uhci_giveback_urb+0xe5/0x15f [<c05eaabf>] uhci_scan_schedule+0x52e/0x767 [<c05f6288>] ? psmouse_handle_byte+0xc/0xe5 [<c054df78>] ? acpi_ev_gpe_detect+0xd6/0xe1 [<c05ec5b0>] uhci_irq+0x110/0x125 [<c05d4834>] usb_hcd_irq+0x40/0xa3 [<c0465313>] handle_IRQ_event+0x2f/0x64 [<c046642b>] handle_level_irq+0x74/0xbe [<c04663b7>] ? handle_level_irq+0x0/0xbe [<c0406e6e>] do_IRQ+0xc7/0xfe [<c0405668>] common_interrupt+0x28/0x30 [<c056821a>] ? acpi_idle_enter_simple+0x162/0x19d [<c0617f52>] cpuidle_idle_call+0x60/0x92 [<c0403c61>] cpu_idle+0x101/0x134 [<c069b1ba>] rest_init+0x4e/0x50 ======================= ---[ end trace b7cc8076093467ad ]--- ------------[ cut here ]------------ WARNING: at kernel/softirq.c:136 _local_bh_enable_ip+0x3d/0xc4() [...] Pid: 0, comm: swapper Tainted: G W 2.6.27.25-170.2.72.fc10.i686 [<c042ddfb>] warn_on_slowpath+0x65/0x8b [<c06ab62b>] ? _spin_unlock_irqrestore+0x22/0x38 [<c04228b4>] ? __enqueue_entity+0xe3/0xeb [<c042431e>] ? enqueue_entity+0x203/0x20b [<c0424361>] ? enqueue_task_fair+0x3b/0x3f [<c041f88c>] ? resched_task+0x3a/0x6e [<c06ab62b>] ? _spin_unlock_irqrestore+0x22/0x38 [<c06ab4e2>] ? _spin_lock_bh+0xb/0x16 [<f8b6f642>] ? mkiss_receive_buf+0x33d/0x3a6 [mkiss] [<c04325f9>] _local_bh_enable_ip+0x3d/0xc4 [<c0432688>] local_bh_enable_ip+0x8/0xa [<c06ab54d>] _spin_unlock_bh+0x11/0x13 [<f8b6f642>] mkiss_receive_buf+0x33d/0x3a6 [mkiss] [<c0572a30>] flush_to_ldisc+0xf7/0x198 [<c0572b12>] tty_flip_buffer_push+0x41/0x51 [<f89477f2>] ftdi_process_read+0x375/0x4ad [ftdi_sio] [<f8947a5a>] ftdi_read_bulk_callback+0x130/0x138 [ftdi_sio] [<c05d4bec>] usb_hcd_giveback_urb+0x63/0x93 [<c05ea290>] uhci_giveback_urb+0xe5/0x15f [<c05eaabf>] uhci_scan_schedule+0x52e/0x767 [<c05f6288>] ? psmouse_handle_byte+0xc/0xe5 [<c054df78>] ? acpi_ev_gpe_detect+0xd6/0xe1 [<c05ec5b0>] uhci_irq+0x110/0x125 [<c05d4834>] usb_hcd_irq+0x40/0xa3 [<c0465313>] handle_IRQ_event+0x2f/0x64 [<c046642b>] handle_level_irq+0x74/0xbe [<c04663b7>] ? handle_level_irq+0x0/0xbe [<c0406e6e>] do_IRQ+0xc7/0xfe [<c0405668>] common_interrupt+0x28/0x30 [<c056821a>] ? acpi_idle_enter_simple+0x162/0x19d [<c0617f52>] cpuidle_idle_call+0x60/0x92 [<c0403c61>] cpu_idle+0x101/0x134 [<c069b1ba>] rest_init+0x4e/0x50 ======================= ---[ end trace b7cc8076093467ad ]---
mkiss: ax0: Trying crc-smack
mkiss: ax0: Trying crc-flexnet
The issue was, that the locking code in mkiss was assuming it was only ever being called in process or bh context. Fixed by converting the involved locking code to use irq-safe locks.
Review of other networking line disciplines shows that 6pack, both sync
and async PPP and STRIP have similar issues. The ppp_async one is the
most interesting one as it sorts out half of the issue as far back as
2004 in commit http://git.kernel.org/?p=linux/kernel/git/tglx/history.git;a=commitdiff;h=2996d8deaeddd01820691a872550dc0cfba0c37d
---
v2 - convert some more mkiss.c _bh locks to irq-save locks.
drivers/net/hamradio/6pack.c | 10 ++++++---- drivers/net/hamradio/mkiss.c | 41 ++++++++++++++++++++++++----------------- drivers/net/ppp_async.c | 11 +++++++---- drivers/net/ppp_synctty.c | 11 +++++++---- drivers/net/wireless/strip.c | 39 ++++++++++++++++++++++++--------------- 5 files changed, 68 insertions(+), 44 deletions(-)
drivers/net/hamradio/6pack.c +6 -4
@@ -398,13 +398,14 @@ static DEFINE_RWLOCK(disc_data_lock);static struct sixpack *sp_get (struct tty_struct *tty) { +unsigned long flags;struct sixpack *sp; -read_lock (&disc_data_lock); +read_lock_irqsave (&disc_data_lock, flags); sp = tty->disc_data;if (sp)atomic_inc (&sp->refcnt); -read_unlock (&disc_data_lock); +read_unlock_irqrestore (&disc_data_lock, flags);return sp; }
@@ -688,12 +689,13 @@ out:*/ static void sixpack_close (struct tty_struct *tty) { +unsigned long flags;struct sixpack *sp; -write_lock (&disc_data_lock); +write_lock_irqsave (&disc_data_lock, flags); sp = tty->disc_data; tty->disc_data =NULL ; -write_unlock (&disc_data_lock); +write_unlock_irqrestore (&disc_data_lock, flags);if (!sp)return ;
drivers/net/hamradio/mkiss.c +24 -17
154 lines not on this page · raw message
drivers/net/ppp_async.c +7 -4
@@ -132,13 +132,15 @@ static DEFINE_RWLOCK(disc_data_lock);static struct asyncppp *ap_get (struct tty_struct *tty) { +unsigned long flags;struct asyncppp *ap; -read_lock (&disc_data_lock); +read_lock_irqsave (&disc_data_lock, flags); ap = tty->disc_data;if (ap !=NULL )atomic_inc (&ap->refcnt); -read_unlock (&disc_data_lock); +read_unlock_irqrestore (&disc_data_lock, flags); +return ap; }
@@ -215,12 +217,13 @@ ppp_asynctty_open(struct tty_struct *tty)static void ppp_asynctty_close (struct tty_struct *tty) { +unsigned long flags;struct asyncppp *ap; -write_lock_irq (&disc_data_lock); +write_lock_irqsave (&disc_data_lock, flags); ap = tty->disc_data; tty->disc_data =NULL ; -write_unlock_irq (&disc_data_lock); +write_unlock_irqrestore (&disc_data_lock, flags);if (!ap)return ;
drivers/net/ppp_synctty.c +7 -4
@@ -182,13 +182,15 @@ static DEFINE_RWLOCK(disc_data_lock);static struct syncppp *sp_get (struct tty_struct *tty) { +unsigned long flags;struct syncppp *ap; -read_lock (&disc_data_lock); +read_lock_irqsave (&disc_data_lock, flags); ap = tty->disc_data;if (ap !=NULL )atomic_inc (&ap->refcnt); -read_unlock (&disc_data_lock); +read_unlock_irqrestore (&disc_data_lock, flags); +return ap; }
@@ -262,12 +264,13 @@ ppp_sync_open(struct tty_struct *tty)static void ppp_sync_close (struct tty_struct *tty) { +unsigned long flags;struct syncppp *ap; -write_lock_irq (&disc_data_lock); +write_lock_irqsave (&disc_data_lock, flags); ap = tty->disc_data; tty->disc_data =NULL ; -write_unlock_irq (&disc_data_lock); +write_unlock_irqrestore (&disc_data_lock, flags);if (!ap)return ;
drivers/net/wireless/strip.c +24 -15
@@ -856,6 +856,7 @@ static int strip_change_mtu(struct net_device *dev, int new_mtu)unsigned char *orbuff = strip_info->rx_buff;unsigned char *osbuff = strip_info->sx_buff;unsigned char *otbuff = strip_info->tx_buff; +unsigned long flags;if (new_mtu >MAX_SEND_MTU ) { printk(KERN_ERR
@@ -864,11 +865,11 @@ static int strip_change_mtu(struct net_device *dev, int new_mtu)return -EINVAL ; } -spin_lock_bh (&strip_lock); +spin_lock_irqsave (&strip_lock, flags);if (!allocate_buffers (strip_info, new_mtu)) {printk (KERN_ERR "%s: unable to grow strip buffers, MTU change cancelled.\n" , strip_info->dev->name); -spin_unlock_bh (&strip_lock); +spin_unlock_irqrestore (&strip_lock, flags);return -ENOMEM ; }
@@ -892,7 +893,7 @@ static int strip_change_mtu(struct net_device *dev, int new_mtu) } } strip_info->tx_head = strip_info->tx_buff; -spin_unlock_bh (&strip_lock); +spin_unlock_irqrestore (&strip_lock, flags);printk (KERN_NOTICE "%s: strip MTU changed fom %d to %d.\n" , strip_info->dev->name, old_mtu, strip_info->mtu);
@@ -983,10 +984,13 @@ static void strip_seq_neighbours(struct seq_file *seq,const MetricomNodeTable * table, const char *title) { -/* We wrap this in a do/while loop, so if the table changes */ -/* while we're reading it, we just go around and try again. */ + unsigned long flags;struct timeval t; +/* +* We wrap this in a do/while loop, so if the table changes +* while we're reading it, we just go around and try again. +*/ do { int i; t = table->timestamp;
@@ -995,9 +999,9 @@ static void strip_seq_neighbours(struct seq_file *seq,for (i =0 ; i < table->num_nodes; i++) {MetricomNode node; -spin_lock_bh (&strip_lock); +spin_lock_irqsave (&strip_lock, flags); node = table->node[i]; -spin_unlock_bh (&strip_lock); +spin_unlock_irqrestore (&strip_lock, flags);seq_printf (seq," %s\n" , node.c); } } while (table->timestamp.tv_sec != t.tv_sec
@@ -1536,6 +1540,7 @@ static void strip_send(struct strip *strip_info, struct sk_buff *skb)static int strip_xmit (struct sk_buff *skb,struct net_device *dev) {struct strip *strip_info =netdev_priv (dev); +unsigned long flags;if (!netif_running (dev)) { printk(KERN_ERR "%s: xmit call when iface is down\n",
@@ -1574,11 +1579,11 @@ static int strip_xmit(struct sk_buff *skb, struct net_device *dev) strip_info->dev->name, sx_pps_count / 8); } -spin_lock_bh (&strip_lock); +spin_lock_irqsave (&strip_lock, flags);strip_send (strip_info, skb); -spin_unlock_bh (&strip_lock); +spin_unlock_irqrestore (&strip_lock, flags);if (skb)dev_kfree_skb (skb);
@@ -2263,12 +2268,13 @@ static void strip_receive_buf(struct tty_struct *tty, const unsigned char *cp, {struct strip *strip_info = tty->disc_data;const unsigned char *end = cp + count; +unsigned long flags;if (!strip_info || strip_info->magic !=STRIP_MAGIC || !netif_running (strip_info->dev))return ; -spin_lock_bh (&strip_lock); +spin_lock_irqsave (&strip_lock, flags);#if 0 {struct timeval tv;
@@ -2335,7 +2341,7 @@ static void strip_receive_buf(struct tty_struct *tty, const unsigned char *cp, } cp++; } -spin_unlock_bh (&strip_lock); +spin_unlock_irqrestore (&strip_lock, flags); }
@@ -2523,9 +2529,11 @@ static void strip_dev_setup(struct net_device *dev)static void strip_free (struct strip *strip_info) { -spin_lock_bh (&strip_lock); +unsigned long flags; + +spin_lock_irqsave (&strip_lock, flags);list_del_rcu (&strip_info->list); -spin_unlock_bh (&strip_lock); +spin_unlock_irqrestore (&strip_lock, flags); strip_info->magic =0 ;
@@ -2539,6 +2547,7 @@ static void strip_free(struct strip *strip_info)static struct strip *strip_alloc (void ) {struct list_head *n; +unsigned long flags;struct net_device *dev;struct strip *strip_info;
@@ -2562,7 +2571,7 @@ static struct strip *strip_alloc(void) strip_info->idle_timer.function = strip_IdleTask; -spin_lock_bh (&strip_lock); +spin_lock_irqsave (&strip_lock, flags); rescan:/* * Search the list to find where to put our new entry
@@ -2581,7 +2590,7 @@ static struct strip *strip_alloc(void)sprintf (dev->name,"st%ld" , dev->base_addr);list_add_tail_rcu (&strip_info->list, &strip_list); -spin_unlock_bh (&strip_lock); +spin_unlock_irqrestore (&strip_lock, flags);return strip_info; }
Quoted 3 lines
The issue was, that the locking code in mkiss was assuming it was only ever being called in process or bh context. Fixed by converting the involved locking code to use irq-safe locks.
Which historically of course was correct until the networking layer changed behaviour some years ago.
These look good to me.
David Miller
maintainerFrom: Alan Cox <[email protected]>
Date: Sun, 12 Jul 2009 23:48:54 +0100
Quoted 6 lines
Quoted 3 lines
The issue was, that the locking code in mkiss was assuming it was only ever being called in process or bh context. Fixed by converting the involved locking code to use irq-safe locks.
Which historically of course was correct until the networking layer changed behaviour some years ago.
Networking layer? Surely you mean the TTY layer or USB because I don't see anything networking in his traces :-)
Quoted 1 line
These look good to me.
Thanks for reviewing, I'll apply his patch.
Quoted 7 lines · On Sun, 12 Jul 2009 21:07:30 -0700 (PDT) David Miller <[email protected]>…
From: Alan Cox <[email protected]>
Date: Sun, 12 Jul 2009 23:48:54 +0100Quoted 4 lines
Quoted 3 lines
The issue was, that the locking code in mkiss was assuming it was only ever being called in process or bh context. Fixed by converting the involved locking code to use irq-safe locks.
Quoted 5 lines
Quoted 2 lines
Which historically of course was correct until the networking layer changed behaviour some years ago.
Networking layer? Surely you mean the TTY layer or USB because I don't see anything networking in his traces :-)
No I mean the network layer.
Historically it went
network bh
transmit packet
ldisc layer
tty write method
and lots of code assumed that. Today the network bits get kicked off at IRQ level.
Most tty stuff now handles it, some of it has been broken with ppp for ages but its been so long its hardly a regression any more and its dumb stuff like jtag consoles and i2c serial ports that break.
David Miller
maintainerFrom: Alan Cox <[email protected]>
Date: Mon, 13 Jul 2009 09:19:28 +0100
Quoted 8 lines
Historically it went
network bh
transmit packet
ldisc layer
tty write methodand lots of code assumed that.
They still can assume such things. All locking is BH based, all networking transmit paths occur in BH or with BH's disabled, never in hardware interrupt context.
Even TX reclaim hardware interrupts that free SKBs reschedule that work to BH context.
Quoted 1 line
Today the network bits get kicked off at IRQ level.
That would be news to me :)
Where do you see that in the traces that Ralf posted? His trace was in fact a TTY receive path via USB:
cpu_idle()
handle_IRQ_event() uhci_irq() ftdi_read_bulk_callback() ftdi_process_read() tty_flip_buffer() flush_to_ldisc() mkiss_receive_buf() spin_lock_bh() --> BH disable in hard IRQ, OH NOEZ!
And, as Ralf's changelog stated:
--------------------
The issue was, that the locking code in mkiss was assuming it was only ever being called in process or bh context. Fixed by converting the involved locking code to use irq-safe locks.
--------------------
mkiss_receive_buf(), the problematic code path, is invoked by the TTY layer directly from LDISC flushing and the TTY device's IRQ handler here.
How does networking's TX policy have anything to do with this?
Quoted 1 line
spin_lock_bh() --> BH disable in hard IRQ, OH NOEZ!
No I didn't see his original message just the patch - his original is a fixed bug.
Quoted 5 lines
mkiss_receive_buf(), the problematic code path, is invoked by the TTY layer directly from LDISC flushing and the TTY device's IRQ handler here.How does networking's TX policy have anything to do with this?
Sorry I'd been looking at the other side stuff with ppp which is a sleeping v bh issue and misinterpreted Ralf's post.
In fact Ralf's fix isn't needed. The incorrect uses of tty->low_latency all got killed and the pty code got rewritten which was the other case that could occur.