From patchwork Wed Oct 19 14:55:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Ogness X-Patchwork-Id: 5642 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp379187wrs; Wed, 19 Oct 2022 08:10:28 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7/U9FBkbXmHPsov2EbGu92ZMlvGZp/2W1RsvxaCgFMw9YC+wiGhWzdAdGzL83pXlHJY8Uv X-Received: by 2002:a17:907:628a:b0:781:bbff:1d42 with SMTP id nd10-20020a170907628a00b00781bbff1d42mr6976224ejc.375.1666192227934; Wed, 19 Oct 2022 08:10:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666192227; cv=none; d=google.com; s=arc-20160816; b=hZ528hdeTHG/yOmN+kEd/lbd36T5k4oRBf0Oj/8qlNCzApbK5lwofwicRqqB0uTeBm 4T4hl714Fcgw7GCxbo6WsGAH6y8moGFYeEdy6wkWXKqIRJ5BO7J1nMnVBnX/TJdszFtq G5B0VFunraxFmAiaotSUUwNKIkUdIeP+eHOA2ZbuQ77bp3GG76q8boPx5QX65RlbUyND 04UmLWBQQ6m1thZiQs3m/pcU+115E/xAzNXD8YgH2gV3AsqUiI/WTfdPN8lRnP3zjqmU FOkac240ZjEkJAdHIqvm+QyPBaToPmEtlDFlphWMqQ2WSvtEntXhJb78OTM4kO32KM72 J2KQ== 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:dkim-signature :dkim-signature:from; bh=4O5jxh5GAGfpdp5oJs484DSsKK6l20yyCIa5aoPwGXk=; b=PYZGNX0B72qQutyO9UY39PRXRZdXjB3XAL7RhkRrLKcSg9aBuC9Fa2KMmFHdslmc0B p2pHH0p5j7cWWKxdqFBCKxXixHjQWhwVVKQWto688zFXO0ATEW5L58oll60FrLp9XEtM y7HCB1XDQ9JCjR2JOcCJoBEPJwnJ791eB55mg3hHd1yMuZej6pLQtVr3wlTTjykxqktQ JDOSX1ectGg2JCeFHgAwpWTbvuaT6pSJUqml98qO9eGMMyRVZ7/k9R0cy1v7HYZ39A6b lv4cdtnnrL3TTnmvlCIuyQBcnJ1FO71hsX4D4O+5q32+yI1yneD3/PD/wgZwD0AaxmJr urDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=iTFnKkvn; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=Fu+pjLGg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gt31-20020a1709072d9f00b0078debc9d30fsi17682204ejc.45.2022.10.19.08.09.44; Wed, 19 Oct 2022 08:10:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=iTFnKkvn; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=Fu+pjLGg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232087AbiJSPGr (ORCPT + 99 others); Wed, 19 Oct 2022 11:06:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231844AbiJSPFk (ORCPT ); Wed, 19 Oct 2022 11:05:40 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2BBC729359 for ; Wed, 19 Oct 2022 07:59:16 -0700 (PDT) From: John Ogness DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1666191380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4O5jxh5GAGfpdp5oJs484DSsKK6l20yyCIa5aoPwGXk=; b=iTFnKkvnbpZV48iaml8m+GkgSuO5UhuOPyuwAZtb2zPnRQi7Q9F4bM6+9lA4A7g8iLXRPd YskL9UUUkyQiWaD7JtvivltiLNH8BP8o6m91bP4hX2T8rN8aIfG2pRKSjDnwavHqzgJPPV nrYAxW/rTJ6goH7HYUGv9GT708RbC4YLBn8W9dJ8z3JyuVftTLtv+1ZS/5rmxKUb9ktAUm BgVLY8s9nkfmIpUG/QSKgxDcIcLYqhI4RlNOE8A1GA41IpZ+VNXZl9Gg4FBPnbWvrjYEqb U0yyXtmvo+SVOmto2TaiY3F5ePVRNqLXYpMZ3YduuR2WllgLWVcBt1SII0WNoQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1666191380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4O5jxh5GAGfpdp5oJs484DSsKK6l20yyCIa5aoPwGXk=; b=Fu+pjLGgV9HHXN5WM5d4ymQB19nzJZDTwV/1OFZhHc0jWJPZqGp6+7wJwb+s9hVvpKQ2+6 kYID/meOJJNW9SAg== To: Petr Mladek Cc: Sergey Senozhatsky , Steven Rostedt , Thomas Gleixner , linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Jiri Slaby Subject: [PATCH printk v2 35/38] tty: tty_io: use console_list_lock for list synchronization Date: Wed, 19 Oct 2022 17:01:57 +0206 Message-Id: <20221019145600.1282823-36-john.ogness@linutronix.de> In-Reply-To: <20221019145600.1282823-1-john.ogness@linutronix.de> References: <20221019145600.1282823-1-john.ogness@linutronix.de> MIME-Version: 1.0 X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,INVALID_DATE_TZ_ABSURD, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747129181933947685?= X-GMAIL-MSGID: =?utf-8?q?1747129181933947685?= show_cons_active() uses the console_lock to gather information on registered consoles. It requires that no consoles are unregistered until it is finished. The console_list_lock should be used because list synchronization repsponsibility will be removed from the console_lock in a later change. Note, the console_lock is still needed to stop console printing. Signed-off-by: John Ogness Reviewed-by: Greg Kroah-Hartman Reviewed-by: Petr Mladek --- drivers/tty/tty_io.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index 333579bfa335..46a0e3c5c3a5 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -3527,14 +3527,12 @@ static ssize_t show_cons_active(struct device *dev, ssize_t count = 0; /* - * Hold the console_lock to guarantee that no consoles are + * Hold the console_list_lock to guarantee that no consoles are * unregistered until all console processing is complete. * This also allows safe traversal of the console list. - * - * Stop console printing because the device() callback may - * assume the console is not within its write() callback. */ - console_lock(); + console_list_lock(); + for_each_console(c) { if (!c->device) continue; @@ -3546,6 +3544,12 @@ static ssize_t show_cons_active(struct device *dev, if (i >= ARRAY_SIZE(cs)) break; } + + /* + * Stop console printing because the device() callback may + * assume the console is not within its write() callback. + */ + console_lock(); while (i--) { int index = cs[i]->index; struct tty_driver *drv = cs[i]->device(cs[i], &index); @@ -3561,6 +3565,8 @@ static ssize_t show_cons_active(struct device *dev, } console_unlock(); + console_list_unlock(); + return count; } static DEVICE_ATTR(active, S_IRUGO, show_cons_active, NULL);