From patchwork Mon Nov 7 14:16:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Ogness X-Patchwork-Id: 16466 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2080198wru; Mon, 7 Nov 2022 06:23:43 -0800 (PST) X-Google-Smtp-Source: AMsMyM6UPQzmrewTFvudZ/vuz5nOAnyIfsblJW4pQzh9at+V+S+q4wKuUKuFkZteJ/R+Y+Oi3kPy X-Received: by 2002:a17:90b:4ac5:b0:213:e936:a843 with SMTP id mh5-20020a17090b4ac500b00213e936a843mr42194820pjb.156.1667831023127; Mon, 07 Nov 2022 06:23:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667831023; cv=none; d=google.com; s=arc-20160816; b=E37L6Ml4+yNnz6OUYUcjfrfCeRhVN45jDERmL0Viy8x7k6FDsLl478MTtvW544Kllj SpTdff6xNUBJWoEYQEe3iTsHZWoRi0X0mo26hAWnlgAALYTv4wzXiC6syvhmrDe9A1lT fcqP0DtZmhlOc0YraAAqqX2TrbakzZvZNMj+Oh2LjLXhZKqbhLPLvXABASHuAMYYtMdg Vzi6RGubBLalvUI00ir33lYjl77d/Jl2MDJQ7DFKGETXJVhRodnlbCOeQnelhy4ycYMV 81egdzP3AmZA7qt7z67F/6eTzJl4ljlqpA/gBce76SGR4gxNXZ9oARJFURnpJVfOkVaJ IkfA== 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=HrXEQGG/m3o0hMbY11og/wMwGQrEN/gibAggQL0SPtA=; b=ymTxQyTtaqgVQ6A3U5rbeAbtJZigCzAybyTT0YLkstPgjV37Ek/9fAGst8dIYUsdih rdolvRZSR5B82qcBTisthc02GCAb1jB0FUXdBMrquSh5LxWyRjrjYPglqFHFFRrL+AKU kPz6sx4c3EuqWnhkaKT26ulDbG5N9WhcNBdMDE98qkfa5KQwQ7g3L9veg1VZY86+WThH VLLXHyWTDZorXm+7Pd9mo7x8JUWqQYRZhbjdxNV8lChF55ufFUgHPLq0uWoqqMWn+V3C 9ccW7S+pGnDoARv49lPuYTlffZq9oq++Wc1RWozFyp4qqfYghmqkB7Fcs0gtut5MKXVa um/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=ZJIABBsS; 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 d4-20020a623604000000b00536bbfa4994si9007994pfa.345.2022.11.07.06.23.30; Mon, 07 Nov 2022 06:23:43 -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=ZJIABBsS; 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 S232487AbiKGOTq (ORCPT + 99 others); Mon, 7 Nov 2022 09:19:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55686 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232172AbiKGOQv (ORCPT ); Mon, 7 Nov 2022 09:16:51 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B738F1D0DE for ; Mon, 7 Nov 2022 06:16:50 -0800 (PST) From: John Ogness DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1667830609; 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=HrXEQGG/m3o0hMbY11og/wMwGQrEN/gibAggQL0SPtA=; b=ZJIABBsSof8Zufabq1/Z2hKR4mPv7ugUtGQX7+O3byXTACBdSXeY81SZe1umutmD9nPJWt jM1rPfi7UDHWD/dtbCdpoKuBWs2IfwbtIoEDfFHhyO2QYZYvcOCY17sYycEx/GQ3PWDI17 GAehm9J+D2mvy90cX6OAGzIirBwlyvByKnAcFJdugWkgH4UxwjjTE3T6nhkolWCu7aYYNS nQPXmxzvv6/lRPxu/NvsGzZstvo17s8gIChTWNc9Yz3jMdoJYSi97QOtNk682v9hxuZDME uiDb2XL4XQLRbnO5PYf+lQU1O9E2z5NY472LZkYcFDA8IHv0JJdlid1UhqdCpA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1667830609; 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=HrXEQGG/m3o0hMbY11og/wMwGQrEN/gibAggQL0SPtA=; b=YNb5nb/11Kv8fmBiMLgjRDH4ietWRBzey9gsumdX/y4uojIWEDAls7EIUZ1H+k1cNIEXEp 90sDo/rIBeMlVSBA== To: Petr Mladek Cc: Sergey Senozhatsky , Steven Rostedt , Thomas Gleixner , linux-kernel@vger.kernel.org Subject: [PATCH printk v3 20/40] printk: __pr_flush: use srcu console list iterator Date: Mon, 7 Nov 2022 15:22:18 +0106 Message-Id: <20221107141638.3790965-21-john.ogness@linutronix.de> In-Reply-To: <20221107141638.3790965-1-john.ogness@linutronix.de> References: <20221107141638.3790965-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?1748847583129203591?= X-GMAIL-MSGID: =?utf-8?q?1748847583129203591?= Use srcu console list iteration for console list traversal. Document why the console_lock is still necessary. Note that this is a preparatory change for when console_lock no longer provides synchronization for the console list. Signed-off-by: John Ogness Reviewed-by: Petr Mladek --- kernel/printk/printk.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index ec50777d0301..d8ccb7b523e2 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -3480,6 +3480,7 @@ static bool __pr_flush(struct console *con, int timeout_ms, bool reset_on_progre struct console *c; u64 last_diff = 0; u64 printk_seq; + int cookie; u64 diff; u64 seq; @@ -3490,9 +3491,15 @@ static bool __pr_flush(struct console *con, int timeout_ms, bool reset_on_progre for (;;) { diff = 0; + /* + * Hold the console_lock to guarantee safe access to + * console->seq and to prevent changes to @console_suspended + * until all consoles have been processed. + */ console_lock(); - for_each_console(c) { + cookie = console_srcu_read_lock(); + for_each_console_srcu(c) { if (con && con != c) continue; if (!console_is_usable(c)) @@ -3501,6 +3508,7 @@ static bool __pr_flush(struct console *con, int timeout_ms, bool reset_on_progre if (printk_seq < seq) diff += seq - printk_seq; } + console_srcu_read_unlock(cookie); /* * If consoles are suspended, it cannot be expected that they