From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: torvalds@linux-foundation.org, akpm@linux-foundation.org,
alan@lxorguk.ukuu.org.uk, Jiri Slaby <jslaby@suse.cz>,
Dave Young <hidave.darkstar@gmail.com>,
Dave Jones <davej@redhat.com>,
Ben Hutchings <ben@decadent.org.uk>,
Dmitriy Matrosov <sgf.dma@gmail.com>
Subject: [25/53] TTY: ldisc, wait for ldisc infinitely in hangup
Date: Tue, 22 Nov 2011 16:25:25 -0800 [thread overview]
Message-ID: <20111123002555.262096594@clark.kroah.org> (raw)
In-Reply-To: <20111123002601.GA14467@kroah.com>
3.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Slaby <jslaby@suse.cz>
commit 0c73c08ec73dbe080b9ec56696ee21d32754d918 upstream.
For /dev/console case, we do not kill all ldisc users. It's due to
redirected_tty_write test in __tty_hangup. In that case there still
might be a process waiting e.g. in n_tty_read for input.
We wait for such processes to disappear. The problem is that we use a
timeout. After this timeout, we continue closing the ldisc and start
freeing tty resources. It obviously leads to crashes when the other
process is woken.
So to fix this, we wait infinitely before reiniting the ldisc. (The
tiocsetd remains untouched -- times out after 5s.)
This is nicely reproducible with this run from shell:
exec 0<>/dev/console 1<>/dev/console 2<>/dev/console
and stopping a getty like:
systemctl stop serial-getty@ttyS0.service
The crash proper may be produced only under load or with constified
timing the same as for 92f6fa09b.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Dave Young <hidave.darkstar@gmail.com>
Cc: Dave Jones <davej@redhat.com>
Cc: Ben Hutchings <ben@decadent.org.uk>
Cc: Dmitriy Matrosov <sgf.dma@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/tty/tty_ldisc.c | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
--- a/drivers/tty/tty_ldisc.c
+++ b/drivers/tty/tty_ldisc.c
@@ -36,6 +36,7 @@
#include <linux/kmod.h>
#include <linux/nsproxy.h>
+#include <linux/ratelimit.h>
/*
* This guards the refcounted line discipline lists. The lock
@@ -838,7 +839,7 @@ void tty_ldisc_hangup(struct tty_struct
tty_unlock();
cancel_work_sync(&tty->buf.work);
mutex_unlock(&tty->ldisc_mutex);
-
+retry:
tty_lock();
mutex_lock(&tty->ldisc_mutex);
@@ -847,7 +848,21 @@ void tty_ldisc_hangup(struct tty_struct
it means auditing a lot of other paths so this is
a FIXME */
if (tty->ldisc) { /* Not yet closed */
- WARN_ON_ONCE(tty_ldisc_wait_idle(tty, 5 * HZ));
+ if (atomic_read(&tty->ldisc->users) != 1) {
+ char cur_n[TASK_COMM_LEN], tty_n[64];
+ long timeout = 3 * HZ;
+ tty_unlock();
+
+ while (tty_ldisc_wait_idle(tty, timeout) == -EBUSY) {
+ timeout = MAX_SCHEDULE_TIMEOUT;
+ printk_ratelimited(KERN_WARNING
+ "%s: waiting (%s) for %s took too long, but we keep waiting...\n",
+ __func__, get_task_comm(cur_n, current),
+ tty_name(tty, tty_n));
+ }
+ mutex_unlock(&tty->ldisc_mutex);
+ goto retry;
+ }
if (reset == 0) {
next prev parent reply other threads:[~2011-11-23 0:57 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-23 0:26 [00/53] 3.1.3-stable review Greg KH
2011-11-23 0:25 ` [01/53] genirq: Fix irqfixup, irqpoll regression Greg KH
2011-11-23 0:25 ` [02/53] ALSA: hda - Fix the connection selection of ADCs on Cirrus codecs Greg KH
2011-11-23 0:25 ` [03/53] [SCSI] fix WARNING: at drivers/scsi/scsi_lib.c:1704 Greg KH
2011-11-23 0:25 ` [04/53] [SCSI] hpsa: Disable ASPM Greg KH
2011-11-23 0:25 ` [05/53] [SCSI] aacraid: controller hangs if kernel uses non-default ASPM policy Greg KH
2011-11-23 0:25 ` [06/53] [media] saa7164: Add support for another HVR2200 hardware revision Greg KH
2011-11-23 0:25 ` [07/53] KVM: s390: Fix RUNNING flag misinterpretation Greg KH
2011-11-23 0:25 ` [08/53] ARM: 7150/1: Allow kernel unaligned accesses on ARMv6+ Greg KH
2011-11-23 0:25 ` [09/53] Net, libertas: Resolve memory leak in if_spi_host_to_card() Greg KH
2011-11-23 0:25 ` [10/53] rt2x00: Fix sleep-while-atomic bug in powersaving code Greg KH
2011-11-23 0:25 ` [11/53] mac80211: fix NULL dereference in radiotap code Greg KH
2011-11-23 0:25 ` [12/53] mac80211: fix bug in ieee80211_build_probe_req Greg KH
2011-11-23 0:25 ` [13/53] nl80211: fix HT capability attribute validation Greg KH
2011-11-23 0:25 ` [14/53] cfg80211: fix bug on regulatory core exit on access to last_request Greg KH
2011-11-23 0:25 ` [15/53] ip6_tunnel: copy parms.name after register_netdevice Greg KH
2011-11-23 0:25 ` [16/53] PM / driver core: disable devices runtime PM during shutdown Greg KH
2011-11-23 0:25 ` [17/53] pch_phub: Support new device LAPIS Semiconductor ML7831 IOH Greg KH
2011-11-23 0:25 ` [18/53] pch_phub: Fix MAC address writing issue for LAPIS ML7831 Greg KH
2011-11-23 0:25 ` [19/53] pch_uart: Fix hw-flow control issue Greg KH
2011-11-23 0:25 ` [20/53] pch_uart: Fix DMA resource leak issue Greg KH
2011-11-23 0:25 ` [21/53] pch_uart: Support new device LAPIS Semiconductor ML7831 IOH Greg KH
2011-11-23 0:25 ` [22/53] tty: hvc_dcc: Fix duplicate character inputs Greg KH
2011-11-23 0:25 ` [23/53] TTY: ldisc, allow waiting for ldisc arbitrarily long Greg KH
2011-11-23 0:25 ` [24/53] TTY: ldisc, move wait idle to caller Greg KH
2011-11-23 0:25 ` Greg KH [this message]
2011-11-23 0:25 ` [26/53] nfs: when attempting to open a directory, fall back on normal lookup (try #5) Greg KH
2011-11-23 0:25 ` [27/53] ALSA: hda - fix ELD memory leak Greg KH
2011-11-23 0:25 ` [28/53] pcie-gadget-spear: Add "platform:" prefix for platform modalias Greg KH
2011-11-23 0:25 ` [29/53] drivers/base/node.c: fix compilation error with older versions of gcc Greg KH
2011-11-23 0:25 ` [30/53] xhci: Set slot and ep0 flags for address command Greg KH
2011-11-23 0:25 ` [31/53] usb, xhci: Clear warm reset change event during init Greg KH
2011-11-23 0:25 ` [32/53] usb, xhci: fix lockdep warning on endpoint timeout Greg KH
2011-11-23 0:25 ` [33/53] USB: XHCI: resume root hubs when the controller resumes Greg KH
2011-11-23 0:25 ` [34/53] USB: option: release new PID for ZTE 3G modem Greg KH
2011-11-23 0:25 ` [35/53] USB: option: add PID of Huawei E173s " Greg KH
2011-11-23 0:25 ` [36/53] USB: serial: pl2303: rm duplicate id Greg KH
2011-11-23 0:25 ` [37/53] USB: pch_udc: Support new device LAPIS Semiconductor ML7831 IOH Greg KH
2011-11-23 0:25 ` [38/53] USB: cdc-acm: Fix disconnect() vs close() race Greg KH
2011-11-23 0:25 ` [39/53] USB: workaround for bug in old version of GCC Greg KH
2011-11-23 0:25 ` [40/53] USB: ark3116 initialisation fix Greg KH
2011-11-23 0:25 ` [41/53] USB: Fix Corruption issue in USB ftdi driver ftdi_sio.c Greg KH
2011-11-23 0:25 ` [42/53] usb-storage: Accept 8020i-protocol commands longer than 12 bytes Greg KH
2011-11-23 0:25 ` [43/53] USB: EHCI: fix HUB TT scheduling issue with iso transfer Greg KH
2011-11-23 0:25 ` [44/53] USB: add quirk for Logitech C600 web cam Greg KH
2011-11-23 0:25 ` [45/53] USB: quirks: adding more quirky webcams to avoid squeaky audio Greg KH
2011-11-23 0:25 ` [46/53] drm/i915: fix IVB cursor support Greg KH
2011-11-23 0:25 ` [47/53] drm/i915: always set FDI composite sync bit Greg KH
2011-11-23 0:25 ` [48/53] batman-adv: fix tt_local_reset_flags() function Greg KH
2011-11-23 0:25 ` [49/53] batman-adv: correctly set the data field in the TT_REPONSE packet Greg KH
2011-11-23 0:25 ` [50/53] batman-adv: remove references for global tt entries Greg KH
2011-11-23 0:25 ` [51/53] batman-adv: add sanity check when removing global tts Greg KH
2011-11-23 0:25 ` [52/53] batman-adv: unify hash_entry field position in tt_local/global_entry Greg KH
2011-11-23 0:25 ` [53/53] vmscan: fix shrinker callback bug in fs/super.c Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111123002555.262096594@clark.kroah.org \
--to=gregkh@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=ben@decadent.org.uk \
--cc=davej@redhat.com \
--cc=hidave.darkstar@gmail.com \
--cc=jslaby@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=sgf.dma@gmail.com \
--cc=stable@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®