Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp5131715imu; Tue, 8 Jan 2019 12:05:50 -0800 (PST) X-Google-Smtp-Source: ALg8bN75ndDOqv9Ek0J1w/Qj0DwnFGEO/Ox5w3l6mO54oB0q9cvWaQNMo/J5B9ozQ53JWTiMkgZV X-Received: by 2002:a17:902:128c:: with SMTP id g12mr3006918pla.146.1546977950190; Tue, 08 Jan 2019 12:05:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546977950; cv=none; d=google.com; s=arc-20160816; b=n/MwDF+loDf1OpD2qJymT2+CYGMzbOZGr6cmxjccdtDcDLwo1cHJ1/YQ5oHKcyTbX6 TN9wQCPMx7+NbNLjgKPK0wjj8NvNhfacOq0t6JH5xagKtnOzriawcZMgXgEptAuOnHnK j6+SHJo2u08Yh5nysc6ibynf37SVI2zWV7E1fKGbELAbzixg63BJS6VmRgOSr85yg1xw Q5fk9ID8yXhLvugcQc+5HI2cTfs/CBdrlQDmd5eKvimUlL8XZiCdp2Etm/dSjFeGt92y Q+vgEhez1NP7jCe9dnTB+H3+R7SqGKEgiWaAu7cYwt8L/GsHJWZO51DsgDXBOn7LU6k3 zCVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=gkn1sH79+OZujmGyab3TRantBcbph8imR5KSXw8aVXs=; b=cuUEbBQD+1SQjerT7YC3hclY0aECCtd2XcxbaLg6NAnSjKir474HFghkFwTzO5COV2 i9L2bnxQyuYs8nzDNibdtQYrEb5H4ODz+RrKR06raYwa2l5bwCwrAxiEe8LkrdcUowJD 8laNyA4NDG5DWWnz+wQD6hPnwf5gn5qULHtOYokd2IsMUv97+PHHS+IsKgbvjtaLfvXm XlsnqGKsrOyc0hRFDKdKNYG+vpoq+R0H4dXnWopBtcJ/1BIn0xNjHOdKfLiR03KKSG2i /JqPU8XEEWJOK4QE/An+xisendOBff1hnsEj8gnSsQY8pTXbx0QYe0KEhwNGvgcXFoK/ 2+JA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=EjLv6zYt; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 11si44075455pgs.126.2019.01.08.12.05.34; Tue, 08 Jan 2019 12:05:50 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=EjLv6zYt; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730694AbfAHUDi (ORCPT + 99 others); Tue, 8 Jan 2019 15:03:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:35788 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729428AbfAHT2l (ORCPT ); Tue, 8 Jan 2019 14:28:41 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6C2962176F; Tue, 8 Jan 2019 19:28:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546975720; bh=Vi3fVnDpSyabi+pGiAi4/hAhhGji6HsCdKe3aPIgpOY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EjLv6zYtjUyON1MBoajHo+rcPHtGiorkE3ajDYL8qZq58LMRgDPZXfVRk2qk/zyIa doI/KfHvMqHNyLZZ4yfNxZtT+8Waiu9PgmQuQ1oktxIMAFKDNsCg9DmvG4whR31qN0 7zuxFpKRP8X3jOeUoUe70doG8gfhVM1MDegHvTLY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sergey Senozhatsky , Sergey Senozhatsky , Greg Kroah-Hartman , Jiri Slaby , Andrew Morton , Waiman Long , Dmitry Safonov , Steven Rostedt , Sasha Levin , linux-serial@vger.kernel.org Subject: [PATCH AUTOSEL 4.20 077/117] tty/serial: do not free trasnmit buffer page under port lock Date: Tue, 8 Jan 2019 14:25:45 -0500 Message-Id: <20190108192628.121270-77-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190108192628.121270-1-sashal@kernel.org> References: <20190108192628.121270-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sergey Senozhatsky [ 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 Reviewed-by: Petr Mladek Acked-by: Peter Zijlstra (Intel) Cc: Greg Kroah-Hartman Cc: Jiri Slaby Cc: Andrew Morton Cc: Waiman Long Cc: Dmitry Safonov Cc: Steven Rostedt Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- 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 c439a5a1e6c0..d4cca5bdaf1c 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -205,10 +205,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) { @@ -268,6 +273,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 @@ -298,14 +304,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