mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>,
	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Jiri Slaby <jslaby@suse.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Waiman Long <longman@redhat.com>,
	Dmitry Safonov <dima@arista.com>,
	Steven Rostedt <rostedt@goodmis.org>,
	Sasha Levin <sashal@kernel.org>,
	linux-serial@vger.kernel.org
Subject: [PATCH AUTOSEL 4.14 33/53] tty/serial: do not free trasnmit buffer page under port lock
Date: Tue,  8 Jan 2019 14:32:01 -0500	[thread overview]
Message-ID: <20190108193222.123316-33-sashal@kernel.org> (raw)
In-Reply-To: <20190108193222.123316-1-sashal@kernel.org>

From: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>

[ Upstream commit d72402145ace0697a6a9e8e75a3de5bf3375f78d ]

LKP has hit yet another circular locking dependency between uart
console drivers and debugobjects [1]:

     CPU0                                    CPU1

                                            rhltable_init()
                                             __init_work()
                                              debug_object_init
     uart_shutdown()                          /* db->lock */
      /* uart_port->lock */                    debug_print_object()
       free_page()                              printk()
                                                 call_console_drivers()
        debug_check_no_obj_freed()                /* uart_port->lock */
         /* db->lock */
          debug_print_object()

So there are two dependency chains:
	uart_port->lock -> db->lock
And
	db->lock -> uart_port->lock

This particular circular locking dependency can be addressed in several
ways:

a) One way would be to move debug_print_object() out of db->lock scope
   and, thus, break the db->lock -> uart_port->lock chain.
b) Another one would be to free() transmit buffer page out of db->lock
   in UART code; which is what this patch does.

It makes sense to apply a) and b) independently: there are too many things
going on behind free(), none of which depend on uart_port->lock.

The patch fixes transmit buffer page free() in uart_shutdown() and,
additionally, in uart_port_startup() (as was suggested by Dmitry Safonov).

[1] https://lore.kernel.org/lkml/20181211091154.GL23332@shao2-debian/T/#u
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Waiman Long <longman@redhat.com>
Cc: Dmitry Safonov <dima@arista.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/tty/serial/serial_core.c | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 6db8844ef3ec..543d0f95f094 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -218,10 +218,15 @@ static int uart_port_startup(struct tty_struct *tty, struct uart_state *state,
 	if (!state->xmit.buf) {
 		state->xmit.buf = (unsigned char *) page;
 		uart_circ_clear(&state->xmit);
+		uart_port_unlock(uport, flags);
 	} else {
+		uart_port_unlock(uport, flags);
+		/*
+		 * Do not free() the page under the port lock, see
+		 * uart_shutdown().
+		 */
 		free_page(page);
 	}
-	uart_port_unlock(uport, flags);
 
 	retval = uport->ops->startup(uport);
 	if (retval == 0) {
@@ -281,6 +286,7 @@ static void uart_shutdown(struct tty_struct *tty, struct uart_state *state)
 	struct uart_port *uport = uart_port_check(state);
 	struct tty_port *port = &state->port;
 	unsigned long flags = 0;
+	char *xmit_buf = NULL;
 
 	/*
 	 * Set the TTY IO error marker
@@ -311,14 +317,18 @@ static void uart_shutdown(struct tty_struct *tty, struct uart_state *state)
 	tty_port_set_suspended(port, 0);
 
 	/*
-	 * Free the transmit buffer page.
+	 * Do not free() the transmit buffer page under the port lock since
+	 * this can create various circular locking scenarios. For instance,
+	 * console driver may need to allocate/free a debug object, which
+	 * can endup in printk() recursion.
 	 */
 	uart_port_lock(state, flags);
-	if (state->xmit.buf) {
-		free_page((unsigned long)state->xmit.buf);
-		state->xmit.buf = NULL;
-	}
+	xmit_buf = state->xmit.buf;
+	state->xmit.buf = NULL;
 	uart_port_unlock(uport, flags);
+
+	if (xmit_buf)
+		free_page((unsigned long)xmit_buf);
 }
 
 /**
-- 
2.19.1


  parent reply	other threads:[~2019-01-08 19:45 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-08 19:31 [PATCH AUTOSEL 4.14 01/53] gpio: pl061: Move irq_chip definition inside struct pl061 Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 02/53] platform/x86: asus-wmi: Tell the EC the OS will handle the display off hotkey Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 03/53] e1000e: allow non-monotonic SYSTIM readings Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 04/53] writeback: don't decrement wb->refcnt if !wb->bdi Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 05/53] serial: set suppress_bind_attrs flag only if builtin Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 06/53] ALSA: oxfw: add support for APOGEE duet FireWire Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 07/53] x86/mce: Fix -Wmissing-prototypes warnings Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 08/53] MIPS: SiByte: Enable swiotlb for SWARM, LittleSur and BigSur Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 09/53] arm64: perf: set suppress_bind_attrs flag to true Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 10/53] USB: serial: ftdi_sio: use rounding when calculating baud rate divisors Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 11/53] usb: gadget: udc: renesas_usb3: add a safety connection way for forced_b_device Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 12/53] selinux: always allow mounting submounts Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 13/53] drm/amdgpu: Correct get_crtc_scanoutpos behavior when vpos >= vtotal Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 14/53] rxe: IB_WR_REG_MR does not capture MR's iova field Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 15/53] jffs2: Fix use of uninitialized delayed_work, lockdep breakage Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 16/53] clk: imx: make mux parent strings const Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 17/53] pstore/ram: Do not treat empty buffers as valid Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 18/53] powerpc/xmon: Fix invocation inside lock region Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 19/53] powerpc/pseries/cpuidle: Fix preempt warning Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 20/53] arm64: relocatable: fix inconsistencies in linker script and options Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 21/53] media: firewire: Fix app_info parameter type in avc_ca{,_app}_info Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 22/53] IB/hfi1: Incorrect sizing of sge for PIO will OOPs Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 23/53] media: venus: core: Set dma maximum segment size Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 24/53] net: call sk_dst_reset when set SO_DONTROUTE Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 25/53] scsi: target: use consistent left-aligned ASCII INQUIRY data Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 26/53] selftests: do not macro-expand failed assertion expressions Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 27/53] clk: imx6q: reset exclusive gates on init Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 28/53] arm64: Fix minor issues with the dcache_by_line_op macro Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 29/53] kconfig: fix file name and line number of warn_ignored_character() Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 30/53] kconfig: fix memory leak when EOF is encountered in quotation Sasha Levin
2019-01-08 19:31 ` [PATCH AUTOSEL 4.14 31/53] mmc: atmel-mci: do not assume idle after atmci_request_end Sasha Levin
2019-01-08 19:32 ` [PATCH AUTOSEL 4.14 32/53] btrfs: improve error handling of btrfs_add_link Sasha Levin
2019-01-08 19:32 ` Sasha Levin [this message]
2019-01-08 19:32 ` [PATCH AUTOSEL 4.14 34/53] perf intel-pt: Fix error with config term "pt=0" Sasha Levin
2019-01-08 19:32 ` [PATCH AUTOSEL 4.14 35/53] perf svghelper: Fix unchecked usage of strncpy() Sasha Levin
2019-01-08 19:32 ` [PATCH AUTOSEL 4.14 36/53] perf parse-events: " Sasha Levin
2019-01-08 19:32 ` [PATCH AUTOSEL 4.14 37/53] netfilter: ipt_CLUSTERIP: check MAC address when duplicate config is set Sasha Levin
2019-01-08 19:32 ` [PATCH AUTOSEL 4.14 38/53] dm crypt: use u64 instead of sector_t to store iv_offset Sasha Levin
2019-01-08 19:32 ` [PATCH AUTOSEL 4.14 39/53] dm kcopyd: Fix bug causing workqueue stalls Sasha Levin
2019-01-08 19:32 ` [PATCH AUTOSEL 4.14 40/53] tools lib subcmd: Don't add the kernel sources to the include path Sasha Levin
2019-01-08 19:32 ` [PATCH AUTOSEL 4.14 41/53] dm snapshot: Fix excessive memory usage and workqueue stalls Sasha Levin
2019-01-08 19:32 ` [PATCH AUTOSEL 4.14 42/53] quota: Lock s_umount in exclusive mode for Q_XQUOTA{ON,OFF} quotactls Sasha Levin
2019-01-08 19:32 ` [PATCH AUTOSEL 4.14 43/53] clocksource/drivers/integrator-ap: Add missing of_node_put() Sasha Levin
2019-01-08 19:32 ` [PATCH AUTOSEL 4.14 44/53] ALSA: bebob: fix model-id of unit for Apogee Ensemble Sasha Levin
2019-01-08 19:32 ` [PATCH AUTOSEL 4.14 45/53] sysfs: Disable lockdep for driver bind/unbind files Sasha Levin
2019-01-08 19:32 ` [PATCH AUTOSEL 4.14 46/53] IB/usnic: Fix potential deadlock Sasha Levin
2019-01-08 19:32 ` [PATCH AUTOSEL 4.14 47/53] scsi: smartpqi: correct lun reset issues Sasha Levin
2019-01-08 19:32 ` [PATCH AUTOSEL 4.14 48/53] scsi: smartpqi: call pqi_free_interrupts() in pqi_shutdown() Sasha Levin
2019-01-08 19:32 ` [PATCH AUTOSEL 4.14 49/53] scsi: megaraid: fix out-of-bound array accesses Sasha Levin
2019-01-08 19:32 ` [PATCH AUTOSEL 4.14 50/53] ocfs2: fix panic due to unrecovered local alloc Sasha Levin
2019-01-08 19:32 ` [PATCH AUTOSEL 4.14 51/53] mm/page-writeback.c: don't break integrity writeback on ->writepage() error Sasha Levin
2019-01-08 19:32 ` [PATCH AUTOSEL 4.14 52/53] mm/swap: use nr_node_ids for avail_lists in swap_info_struct Sasha Levin
2019-01-08 19:32 ` [PATCH AUTOSEL 4.14 53/53] mm, proc: be more verbose about unstable VMA flags in /proc/<pid>/smaps Sasha Levin

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=20190108193222.123316-33-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=dima@arista.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=jslaby@suse.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-serial@vger.kernel.org \
    --cc=longman@redhat.com \
    --cc=rostedt@goodmis.org \
    --cc=sergey.senozhatsky.work@gmail.com \
    --cc=sergey.senozhatsky@gmail.com \
    --cc=stable@vger.kernel.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

Powered by JetHome