Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp445222pxb; Thu, 9 Sep 2021 04:46:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyfqoC4Ma24fpIiTJ3d1omo8t04xL1sicYDkorIap+WeErJoQF1H6qKQfJK4TwV7GccXLUe X-Received: by 2002:a17:906:3809:: with SMTP id v9mr2969895ejc.355.1631187966069; Thu, 09 Sep 2021 04:46:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631187966; cv=none; d=google.com; s=arc-20160816; b=gvagaz3Yz3iem2b7PYQb3pDf/qgUF3Taj2Vf3sWBKlFca937nwpKQpQvOoHb2DhtWN Ex5Yt369VPpgD3V2Dw6Si5GhI1W8Lzb2tMJ6BTQaxcvdd+WNtOBEhdVpsvyizcl3Bj+F lL67k0bQk1Bv7NablxCWmPO6YlUL0C6P8jEUKfDRE89z28XZ3VzR6wJphTnx7YD15Zfd 1yibkelGP76hIgAzOHNhB+BfjivIFn2+HyssL0Xvd8buDoh6tXTy+fQiTwEOykNAvl1N ZbF9F+oWDfnHVElyf+4+JU650+/LEElDP+mKsf6GWFdhSDyPdH+xG4SPjCGhkNBHJ5D2 u/jA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=DcZyT9BzbwQgT/YAe1spjQ/nHgp9mVHNVe/VL14XRe4=; b=v8F38A4Zf5vnM50Z5o5wGqB3lIojcoAmfTsG+b1Fo6OYITFflP2wpV8TG+NMTaT9Ye 59c20Mzf8vNa3FQwaPmmjrGkkzToRltK0TU2fdLKds0Xxfaz+xiBgphx4H5it6yNcJsh Q4EetoV9stGR0QgBLsLhWsxgmXsSD07aytOkKyL1gA7trwraD0tn7Ewl8ieJ6IJP2ZRE RXpc8Vb8nsL8YkvG7YsIX/5H63Fom0TQCIrdPGPy5JGrxxNvKjx00yaez/7+7SE9QVBR 6q17rfutH47bLkEDFWZ6yev0N4uKD5kxileQtIk89ogu0U70a2UYAVVAXIB6V1IceLY6 TOWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pFwBGcpa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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. [23.128.96.18]) by mx.google.com with ESMTP id v3si1583395edc.632.2021.09.09.04.45.41; Thu, 09 Sep 2021 04:46:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pFwBGcpa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S237159AbhIILpa (ORCPT + 99 others); Thu, 9 Sep 2021 07:45:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:46486 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236695AbhIILnb (ORCPT ); Thu, 9 Sep 2021 07:43:31 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 58DE56120D; Thu, 9 Sep 2021 11:42:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631187727; bh=7UCtEtr/QStiFxeem2PIB4IzGccfSnnMDlxg8E1GFug=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pFwBGcpab5zC4ADnOqs8kAbmLYzgPY4sEyQr26GnCsUHpBXF+S+K3+LCoi83AMzzV 7PmdfkZps8ni84BGDT/EtSSVqPcJZkpKcF4amGQ+Vr3fBjbH6rU2JrZRYn9tnlkFii hyXxiiiZ982/LtW81wbj2HAsoq+fP3PjxjEz4Roq7Teaf1Xjm4IcNYpgh2/38FMLWo WEyDiEoDB6KuEA+so1we27nU0OCVNggfojQ/qpN3jiYKcktldS60eZMsI7ufuW07ko eZEVqTQqIKzaYTpkCS93FoPvZ4rpLLElwpqg20ov49Rn4izT4S34yHOgqgsd1JyCA8 mMGKKNJa+4Giw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zheyu Ma , Greg Kroah-Hartman , Sasha Levin , linux-serial@vger.kernel.org Subject: [PATCH AUTOSEL 5.14 047/252] tty: serial: jsm: hold port lock when reporting modem line changes Date: Thu, 9 Sep 2021 07:37:41 -0400 Message-Id: <20210909114106.141462-47-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909114106.141462-1-sashal@kernel.org> References: <20210909114106.141462-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zheyu Ma [ Upstream commit 240e126c28df084222f0b661321e8e3ecb0d232e ] uart_handle_dcd_change() requires a port lock to be held and will emit a warning when lockdep is enabled. Held corresponding lock to fix the following warnings. [ 132.528648] WARNING: CPU: 5 PID: 11600 at drivers/tty/serial/serial_core.c:3046 uart_handle_dcd_change+0xf4/0x120 [ 132.530482] Modules linked in: [ 132.531050] CPU: 5 PID: 11600 Comm: jsm Not tainted 5.14.0-rc1-00003-g7fef2edf7cc7-dirty #31 [ 132.535268] RIP: 0010:uart_handle_dcd_change+0xf4/0x120 [ 132.557100] Call Trace: [ 132.557562] ? __free_pages+0x83/0xb0 [ 132.558213] neo_parse_modem+0x156/0x220 [ 132.558897] neo_param+0x399/0x840 [ 132.559495] jsm_tty_open+0x12f/0x2d0 [ 132.560131] uart_startup.part.18+0x153/0x340 [ 132.560888] ? lock_is_held_type+0xe9/0x140 [ 132.561660] uart_port_activate+0x7f/0xe0 [ 132.562351] ? uart_startup.part.18+0x340/0x340 [ 132.563003] tty_port_open+0x8d/0xf0 [ 132.563523] ? uart_set_options+0x1e0/0x1e0 [ 132.564125] uart_open+0x24/0x40 [ 132.564604] tty_open+0x15c/0x630 Signed-off-by: Zheyu Ma Link: https://lore.kernel.org/r/1626242003-3809-1-git-send-email-zheyuma97@gmail.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/serial/jsm/jsm_neo.c | 2 ++ drivers/tty/serial/jsm/jsm_tty.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/drivers/tty/serial/jsm/jsm_neo.c b/drivers/tty/serial/jsm/jsm_neo.c index bf0e2a4cb0ce..c6f927a76c3b 100644 --- a/drivers/tty/serial/jsm/jsm_neo.c +++ b/drivers/tty/serial/jsm/jsm_neo.c @@ -815,7 +815,9 @@ static void neo_parse_isr(struct jsm_board *brd, u32 port) /* Parse any modem signal changes */ jsm_dbg(INTR, &ch->ch_bd->pci_dev, "MOD_STAT: sending to parse_modem_sigs\n"); + spin_lock_irqsave(&ch->uart_port.lock, lock_flags); neo_parse_modem(ch, readb(&ch->ch_neo_uart->msr)); + spin_unlock_irqrestore(&ch->uart_port.lock, lock_flags); } } diff --git a/drivers/tty/serial/jsm/jsm_tty.c b/drivers/tty/serial/jsm/jsm_tty.c index 8e42a7682c63..d74cbbbf33c6 100644 --- a/drivers/tty/serial/jsm/jsm_tty.c +++ b/drivers/tty/serial/jsm/jsm_tty.c @@ -187,6 +187,7 @@ static void jsm_tty_break(struct uart_port *port, int break_state) static int jsm_tty_open(struct uart_port *port) { + unsigned long lock_flags; struct jsm_board *brd; struct jsm_channel *channel = container_of(port, struct jsm_channel, uart_port); @@ -240,6 +241,7 @@ static int jsm_tty_open(struct uart_port *port) channel->ch_cached_lsr = 0; channel->ch_stops_sent = 0; + spin_lock_irqsave(&port->lock, lock_flags); termios = &port->state->port.tty->termios; channel->ch_c_cflag = termios->c_cflag; channel->ch_c_iflag = termios->c_iflag; @@ -259,6 +261,7 @@ static int jsm_tty_open(struct uart_port *port) jsm_carrier(channel); channel->ch_open_count++; + spin_unlock_irqrestore(&port->lock, lock_flags); jsm_dbg(OPEN, &channel->ch_bd->pci_dev, "finish\n"); return 0; -- 2.30.2