From patchwork Wed Nov 16 16:21:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Ogness X-Patchwork-Id: 21145 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp232711wru; Wed, 16 Nov 2022 08:24:16 -0800 (PST) X-Google-Smtp-Source: AA0mqf5FAKzEFh2zloNOqO3kDbGSxOZJ+3JUZBcv2gYQ9cPGEK3KQlhD7/nSz1ImfRX9nMaZbQ8I X-Received: by 2002:a63:1720:0:b0:46f:f93b:ddc8 with SMTP id x32-20020a631720000000b0046ff93bddc8mr20478838pgl.389.1668615856395; Wed, 16 Nov 2022 08:24:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668615856; cv=none; d=google.com; s=arc-20160816; b=kQoOSCtrebNWtx+RFfdqyee90C7v1hjR/lVVZk/Uq6ZgtIZgzsQD+oDx/PwK+evRgC o9eBaH7n+JYLCKWKi4bisBGKP7SHYrQFdM1NGaLWccQ2e+kHoJqYyIX3Bc2GJOqbRV0K fhn6vbrzbgp0fk4lsUo1OUJMoQzX0Rep2yhZap8g2lyqF62BHnjpREjb5tJskCXr/exH zGBt3ZWjIeLX/im7rF3wUWrT6hNK+cFHy4lQbnjegFLW+mPPQFl5LnXlIKcIhLqu5Guz vzQO6uvXLPZECmZq3Ebyvp5wuPci2HvXUDqpVY7glgizcdNE/RUe+Kq8rhmyM9sCvfCJ dFCA== 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=dwik/3763uUHWTxRRunPLlxyK1IUw8NqJotbljpAOY4=; b=vVc1Hm4ya9aMkUeOH/4LWL9juxFGO1JQAxr3E4V72nXGaRrRUBLZ9x3JfEeF3KDQyu 0yGnx8QZzRhNGThmZ+A9y3jr/lfUYggWId63WWa7m5pEogPU/8Abf4QnXmNC5Gyfb2WD Hxcspy8lDTsNEcw3h5m+TqCtwfah0FpnkAMdYnon0IIQbSls/OLagVrKOdT7tugv/1wW EgzDNMx6d7n+S004WxThjdWkmQCQGiaGzgafOKFPFtEZXbbFgTCu5cZGbYQeBIYwu0CK U6gJwMmiECo0ORRxxg8ooZPkxdy6P27iRYP/7ZyKUTGm+RgDXtNmHq9/LPfHOgVpU0OK idHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=JaroB9hP; dkim=neutral (no key) header.i=@linutronix.de; 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 y4-20020a170902cac400b0016cca53817dsi12826239pld.341.2022.11.16.08.24.03; Wed, 16 Nov 2022 08:24:16 -0800 (PST) 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=JaroB9hP; dkim=neutral (no key) header.i=@linutronix.de; 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 S238402AbiKPQXK (ORCPT + 99 others); Wed, 16 Nov 2022 11:23:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234117AbiKPQWF (ORCPT ); Wed, 16 Nov 2022 11:22:05 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B01B143856 for ; Wed, 16 Nov 2022 08:22:04 -0800 (PST) From: John Ogness DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1668615723; 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=dwik/3763uUHWTxRRunPLlxyK1IUw8NqJotbljpAOY4=; b=JaroB9hPopOfMxbrqK090Z6M7wyOVm0NA0cKZ/SDYVDZGLIkZT9+z6j2ZZwuc03pmrhTbf eux7prTSPhbkaV7o+K8JCq3wHjSfQBJhtez+j65ip10w9XcNvBOruUuIJ7k6YWFkSIhK8l CYPGprrzT+Ybcf3PEIDSohCq/5yNXbnpKbq1BS51PUZU2bAktoTAlvpazS3mTtYn7oPWuE j+VWpzgR/+8mJ2ibx7C3hxVVVtN0OVa+iQLPGCbXznNFQU/M8E/MqmLhG6tQufxdiCmYmj oncn8PFDf8RnWTnyreefgQ9xHQZF1LLdVi4Rmcc3al8S7oRvm3fceP69GYfZNA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1668615723; 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=dwik/3763uUHWTxRRunPLlxyK1IUw8NqJotbljpAOY4=; b=C8fSR7WZSQABfcv0J42d47XCNSOx+CBmi+brrOhA6dvtvdINUAEBbCH7+QH107YGjCCeAB H2Lo20plN1YMKYCg== To: Petr Mladek Cc: Sergey Senozhatsky , Steven Rostedt , Thomas Gleixner , linux-kernel@vger.kernel.org, Greg Kroah-Hartman Subject: [PATCH printk v5 12/40] console: introduce wrappers to read/write console flags Date: Wed, 16 Nov 2022 17:27:24 +0106 Message-Id: <20221116162152.193147-13-john.ogness@linutronix.de> In-Reply-To: <20221116162152.193147-1-john.ogness@linutronix.de> References: <20221116162152.193147-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?1749670540299056678?= X-GMAIL-MSGID: =?utf-8?q?1749670540299056678?= After switching to SRCU for console list iteration, some readers will begin readings console->flags as a data race. Locklessly reading console->flags provides a consistent value because there is at most one CPU modifying console->flags and that CPU is using only read-modify-write operations. Introduce a wrapper for SRCU iterators to read console flags. Introduce a matching wrapper to write to flags of registered consoles. Writing to flags of registered consoles is synchronized by the console_list_lock. Signed-off-by: John Ogness Reviewed-by: Petr Mladek --- include/linux/console.h | 45 +++++++++++++++++++++++++++++++++++++++++ kernel/printk/printk.c | 10 ++++----- 2 files changed, 50 insertions(+), 5 deletions(-) diff --git a/include/linux/console.h b/include/linux/console.h index 24d83e24840b..c1ca461d088a 100644 --- a/include/linux/console.h +++ b/include/linux/console.h @@ -183,6 +183,51 @@ extern void console_list_unlock(void) __releases(console_mutex); extern struct hlist_head console_list; +/** + * console_srcu_read_flags - Locklessly read the console flags + * @con: struct console pointer of console to read flags from + * + * This function provides the necessary READ_ONCE() and data_race() + * notation for locklessly reading the console flags. The READ_ONCE() + * in this function matches the WRITE_ONCE() when @flags are modified + * for registered consoles with console_srcu_write_flags(). + * + * Only use this function to read console flags when locklessly + * iterating the console list via srcu. + * + * Context: Any context. + */ +static inline short console_srcu_read_flags(const struct console *con) +{ + WARN_ON_ONCE(!console_srcu_read_lock_is_held()); + + /* + * Locklessly reading console->flags provides a consistent + * read value because there is at most one CPU modifying + * console->flags and that CPU is using only read-modify-write + * operations to do so. + */ + return data_race(READ_ONCE(con->flags)); +} + +/** + * console_srcu_write_flags - Write flags for a registered console + * @con: struct console pointer of console to write flags to + * @flags: new flags value to write + * + * Only use this function to write flags for registered consoles. It + * requires holding the console_list_lock. + * + * Context: Any context. + */ +static inline void console_srcu_write_flags(struct console *con, short flags) +{ + lockdep_assert_console_list_lock_held(); + + /* This matches the READ_ONCE() in console_srcu_read_flags(). */ + WRITE_ONCE(con->flags, flags); +} + /** * for_each_console_srcu() - Iterator over registered consoles * @con: struct console pointer used as loop cursor diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index f7479fd73114..35018f18f5aa 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -3068,7 +3068,7 @@ void console_stop(struct console *console) __pr_flush(console, 1000, true); console_list_lock(); console_lock(); - console->flags &= ~CON_ENABLED; + console_srcu_write_flags(console, console->flags & ~CON_ENABLED); console_unlock(); console_list_unlock(); @@ -3086,7 +3086,7 @@ void console_start(struct console *console) { console_list_lock(); console_lock(); - console->flags |= CON_ENABLED; + console_srcu_write_flags(console, console->flags | CON_ENABLED); console_unlock(); console_list_unlock(); __pr_flush(console, 1000, true); @@ -3342,7 +3342,7 @@ void register_console(struct console *newcon) } else if (newcon->flags & CON_CONSDEV) { /* Only the new head can have CON_CONSDEV set. */ - console_first()->flags &= ~CON_CONSDEV; + console_srcu_write_flags(console_first(), console_first()->flags & ~CON_CONSDEV); hlist_add_head_rcu(&newcon->node, &console_list); } else { @@ -3399,7 +3399,7 @@ static int unregister_console_locked(struct console *console) console_lock(); /* Disable it unconditionally */ - console->flags &= ~CON_ENABLED; + console_srcu_write_flags(console, console->flags & ~CON_ENABLED); if (hlist_unhashed(&console->node)) { console_unlock(); @@ -3418,7 +3418,7 @@ static int unregister_console_locked(struct console *console) * console has any device attached. Oh well.... */ if (!hlist_empty(&console_list) && console->flags & CON_CONSDEV) - console_first()->flags |= CON_CONSDEV; + console_srcu_write_flags(console_first(), console_first()->flags | CON_CONSDEV); console_unlock();