Received: by 2002:ab2:60d1:0:b0:1f7:5705:b850 with SMTP id i17csp1430185lqm; Thu, 2 May 2024 14:53:11 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXtSDcv+Cd6yy2O+joM60gSmQlYZIoGCmxYLuaYKtSJCsD01EHWJ4yoWiNrMKMtjjq7DupmklZinF81s2wGIEfgM5KVT5lWZWwBtZIojQ== X-Google-Smtp-Source: AGHT+IHoJhXUqKVYwckVqkwUjNLPqNNYS/ebKXEvdYPVPKgpERARBw0MZeX01kAgDNAD9uowm11P X-Received: by 2002:a05:6a21:1f07:b0:1a9:a32d:17cc with SMTP id ry7-20020a056a211f0700b001a9a32d17ccmr782870pzb.18.1714686791104; Thu, 02 May 2024 14:53:11 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1714686791; cv=pass; d=google.com; s=arc-20160816; b=eNFv718fHdQUblp8IaTa6vLwfTdNtfTdLSJWBu1B7l5LsF5ykc6j0n8RsaUpJSe373 voY9XOC09bl9Jmey2nwm0DMiyCxOooNJJeChaIGGWOyimAc3OVQl03CsejidBVvASmve Pd879wcciQf7aY36C0lKBPUCPhRjJRrXQAFfzDReNwo5NR8okvwOgE7G3u/jawy2O9R4 QYNx1Ue/+mh8fbJCqz96/8crnqEPTiOsDX1lxWrb3LrqRL9T71j/xbgXEXYFn3w/l6jX 1Wd83W4ztprE7T97paFhem+RlI45x8xUFrdRyO4DZRvJN36H+Jf3BVugV+2YUlPxqo2N sZ4w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:dkim-signature:dkim-signature:from; bh=SyciDM9MuzozEvvOTWNllt97oz699Qam5LE37cOWrg8=; fh=pKnPKUsir0uEGSsor+4Zc2vgbu+g+ayvUgsdzkuXaoA=; b=MU/hysppesNl4dnlb6rKLPM58/oclRBAPa5yeY82W9z0sCSp20LixJtwpA/WLhBR8o KgkRJIziCfWZGC6OkRVc/VOXYV/q8Qp8bhkfjIURANzPSytCwKysG3piEU2wo6XSTr7J OTEDG9Po2QN0tEFFAVos4Wt3iOmRSDIUBPsahTBrPeGissD9hJ/V+C0NO5Klc/Twatfz xxo5Qxn9/kCGuvqdvCuNNoxmFwrRjtMsiwxEM0Vn5sag3nSac6DZfVSeNITdaB1+ohyx a6vVJVpe1Z/NWllODLELxjRAYxOqy/62ynaLZkiXiEjHLNCXbJkI3wdCQ02aBavCxG/Z tfiw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=nvgm7a7T; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-166971-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-166971-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id d3-20020a63ed03000000b005cf94b8d9ddsi1783652pgi.869.2024.05.02.14.53.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 May 2024 14:53:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-166971-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=nvgm7a7T; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-166971-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-166971-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 17F8528C354 for ; Thu, 2 May 2024 21:42:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6453320127A; Thu, 2 May 2024 21:38:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="nvgm7a7T"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="dfki5hnX" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7807A1C689D for ; Thu, 2 May 2024 21:38:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714685935; cv=none; b=Thjzal2YyegknY6QpUD7SBUhPlOraQUki6a6U79WBtzLj5skSD3ZwMz3pWcIdUz9v20F97Z9YXS+qfpN3TOvd3B8dG8MlwbIOntggczyKAMhkL5lRiOpLXAzpE+Vp/bX+eN6XmAC4oHMjHWnKMgXQ6a88IlRuWqB2BH0bI3BeaE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714685935; c=relaxed/simple; bh=fTtchIpBovev6HupeGoYzelu3WRCB5YiDqZ96NyLiRY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fTYtuXFaizDRY8s4W9/h5q1F4yrvamJ6PMDjR4qsUGPcfgcVFEukR5zzKLRs3ERqK+/zYmQlAC9bxaUp5TH7YjXIx0W6vDW8E0xnTY0RfHYBgMuHf9hjUuxiKjX7iIR1sLGMGP1lwqOAGoJEYeWW1/tR5K7PhIhZ14ADADKyMS8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=nvgm7a7T; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=dfki5hnX; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de From: John Ogness DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1714685931; 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=SyciDM9MuzozEvvOTWNllt97oz699Qam5LE37cOWrg8=; b=nvgm7a7T+GD1ZJ1GC+0zH14GX37sug/8SVerGFNix9ZzgIXN9P1hncurrt67ASH2x1K8hC j32yVmruYRmJHFtSoWp1gKgFT+K79ebMIB+sjhRVj90gWDr/HebxBxRCNT4WtITWLpLI5v 5hYtIpYCaozt8mcUCRsC5fqKibFygTX6VdhMWYl/0Xx4J/0IljLXpdSp5Jwfooy0rQy/TR XXlt2evw8rsAtd9DnRjE+iA/Jx1su3CjpPOp3l1MRFwoPoNiHF6Ni21qSaKBHNZ3LccAiD RD+wwTeouXfbS6iWITMtnKzQTNBWwgLwYHihKcbwCBLQJCyR3TqFIgLmO1hVXg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1714685931; 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=SyciDM9MuzozEvvOTWNllt97oz699Qam5LE37cOWrg8=; b=dfki5hnXKCeKcmraDHEWFg55Af6pZr6tjWUmGNptbv1SkrMFx7ANe4c4/CRJUTsH13M9o1 BAloyq54DGOufiBw== To: Petr Mladek Cc: Sergey Senozhatsky , Steven Rostedt , Thomas Gleixner , linux-kernel@vger.kernel.org Subject: [PATCH printk v5 19/30] printk: nbcon: Provide function to flush using write_atomic() Date: Thu, 2 May 2024 23:44:28 +0206 Message-Id: <20240502213839.376636-20-john.ogness@linutronix.de> In-Reply-To: <20240502213839.376636-1-john.ogness@linutronix.de> References: <20240502213839.376636-1-john.ogness@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Thomas Gleixner Provide nbcon_atomic_flush_pending() to perform flushing of all registered nbcon consoles using their write_atomic() callback. Unlike console_flush_all(), nbcon_atomic_flush_pending() will only flush up through the newest record at the time of the call. This prevents a CPU from printing unbounded when other CPUs are adding records. If new records are added while flushing, it is expected that the dedicated printer threads will print those records. If the printer thread is not available (which is always the case at this point in the rework), nbcon_atomic_flush_pending() _will_ flush all records in the ringbuffer. Unlike console_flush_all(), nbcon_atomic_flush_pending() will fully flush one console before flushing the next. This helps to guarantee that a block of pending records (such as a stack trace in an emergency situation) can be printed atomically at once before releasing console ownership. nbcon_atomic_flush_pending() is safe in any context because it uses write_atomic() and acquires with unsafe_takeover disabled. Use it in console_flush_on_panic() before flushing legacy consoles. The legacy write() callbacks are not fully safe when oops_in_progress is set. Also use it in nbcon_driver_release() to flush records added while the driver had the console locked to perform non-printing operations. Co-developed-by: John Ogness Signed-off-by: John Ogness Signed-off-by: Thomas Gleixner (Intel) --- kernel/printk/internal.h | 2 + kernel/printk/nbcon.c | 162 ++++++++++++++++++++++++++++++++++++++- kernel/printk/printk.c | 2 + 3 files changed, 163 insertions(+), 3 deletions(-) diff --git a/kernel/printk/internal.h b/kernel/printk/internal.h index 5826cd4eed58..5a93825871de 100644 --- a/kernel/printk/internal.h +++ b/kernel/printk/internal.h @@ -85,6 +85,7 @@ bool nbcon_alloc(struct console *con); void nbcon_init(struct console *con, u64 init_seq); void nbcon_free(struct console *con); enum nbcon_prio nbcon_get_default_prio(void); +void nbcon_atomic_flush_pending(void); /* * Check if the given console is currently capable and allowed to print @@ -140,6 +141,7 @@ static inline bool nbcon_alloc(struct console *con) { return false; } static inline void nbcon_init(struct console *con, u64 init_seq) { } static inline void nbcon_free(struct console *con) { } static inline enum nbcon_prio nbcon_get_default_prio(void) { return NBCON_PRIO_NONE; } +static inline void nbcon_atomic_flush_pending(void) { } static inline bool console_is_usable(struct console *con, short flags) { return false; } diff --git a/kernel/printk/nbcon.c b/kernel/printk/nbcon.c index e37af5c72d38..7532eba55d15 100644 --- a/kernel/printk/nbcon.c +++ b/kernel/printk/nbcon.c @@ -850,7 +850,6 @@ EXPORT_SYMBOL_GPL(nbcon_exit_unsafe); * When true is returned, @wctxt->ctxt.backlog indicates whether there are * still records pending in the ringbuffer, */ -__maybe_unused static bool nbcon_emit_next_record(struct nbcon_write_context *wctxt) { struct nbcon_context *ctxt = &ACCESS_PRIVATE(wctxt, ctxt); @@ -953,6 +952,148 @@ enum nbcon_prio nbcon_get_default_prio(void) return NBCON_PRIO_NORMAL; } +/* + * __nbcon_atomic_flush_pending_con - Flush specified nbcon console using its + * write_atomic() callback + * @con: The nbcon console to flush + * @stop_seq: Flush up until this record + * + * Return: 0 if @con was flushed up to @stop_seq Otherwise, error code on + * failure. + * + * Errors: + * + * -EPERM: Unable to acquire console ownership. + * + * -EAGAIN: Another context took over ownership while printing. + * + * -ENOENT: A record before @stop_seq is not available. + * + * If flushing up to @stop_seq was not successful, it only makes sense for the + * caller to try again when -EAGAIN was returned. When -EPERM is returned, + * this context is not allowed to acquire the console. When -ENOENT is + * returned, it cannot be expected that the unfinalized record will become + * available. + */ +static int __nbcon_atomic_flush_pending_con(struct console *con, u64 stop_seq) +{ + struct nbcon_write_context wctxt = { }; + struct nbcon_context *ctxt = &ACCESS_PRIVATE(&wctxt, ctxt); + int err = 0; + + ctxt->console = con; + ctxt->spinwait_max_us = 2000; + ctxt->prio = nbcon_get_default_prio(); + + if (!nbcon_context_try_acquire(ctxt)) + return -EPERM; + + while (nbcon_seq_read(con) < stop_seq) { + /* + * nbcon_emit_next_record() returns false when the console was + * handed over or taken over. In both cases the context is no + * longer valid. + */ + if (!nbcon_emit_next_record(&wctxt)) + return -EAGAIN; + + if (!ctxt->backlog) { + if (nbcon_seq_read(con) < stop_seq) + err = -ENOENT; + break; + } + } + + nbcon_context_release(ctxt); + return err; +} + +/** + * nbcon_atomic_flush_pending_con - Flush specified nbcon console using its + * write_atomic() callback + * @con: The nbcon console to flush + * @stop_seq: Flush up until this record + * + * This will stop flushing before @stop_seq if another context has ownership. + * That context is then responsible for the flushing. Likewise, if new records + * are added while this context was flushing and there is no other context + * to handle the printing, this context must also flush those records. + */ +static void nbcon_atomic_flush_pending_con(struct console *con, u64 stop_seq) +{ + unsigned long flags; + int err; + +again: + /* + * Atomic flushing does not use console driver synchronization (i.e. + * it does not hold the port lock for uart consoles). Therefore IRQs + * must be disabled to avoid being interrupted and then calling into + * a driver that will deadlock trying to acquire console ownership. + */ + local_irq_save(flags); + + err = __nbcon_atomic_flush_pending_con(con, stop_seq); + + local_irq_restore(flags); + + /* + * If flushing was successful but more records are available, this + * context must flush those remaining records because there is no + * other context that will do it. + */ + if (!err && prb_read_valid(prb, nbcon_seq_read(con), NULL)) { + stop_seq = prb_next_reserve_seq(prb); + goto again; + } + + /* + * If there was a new owner, that context is responsible for + * completing the flush. + */ +} + +/** + * __nbcon_atomic_flush_pending - Flush all nbcon consoles using their + * write_atomic() callback + * @stop_seq: Flush up until this record + */ +static void __nbcon_atomic_flush_pending(u64 stop_seq) +{ + struct console *con; + int cookie; + + cookie = console_srcu_read_lock(); + for_each_console_srcu(con) { + short flags = console_srcu_read_flags(con); + + if (!(flags & CON_NBCON)) + continue; + + if (!console_is_usable(con, flags)) + continue; + + if (nbcon_seq_read(con) >= stop_seq) + continue; + + nbcon_atomic_flush_pending_con(con, stop_seq); + } + console_srcu_read_unlock(cookie); +} + +/** + * nbcon_atomic_flush_pending - Flush all nbcon consoles using their + * write_atomic() callback + * + * Flush the backlog up through the currently newest record. Any new + * records added while flushing will not be flushed. This is to avoid + * one CPU printing unbounded because other CPUs continue to add records. + */ +void nbcon_atomic_flush_pending(void) +{ + __nbcon_atomic_flush_pending(prb_next_reserve_seq(prb)); +} + /** * nbcon_alloc - Allocate buffers needed by the nbcon console * @con: Console to allocate buffers for @@ -1064,8 +1205,23 @@ EXPORT_SYMBOL_GPL(nbcon_driver_try_acquire); void nbcon_driver_release(struct console *con) { struct nbcon_context *ctxt = &ACCESS_PRIVATE(con, nbcon_driver_ctxt); + int cookie; - if (nbcon_context_exit_unsafe(ctxt)) - nbcon_context_release(ctxt); + if (!nbcon_context_exit_unsafe(ctxt)) + return; + + nbcon_context_release(ctxt); + + /* + * This context must flush any new records added while the console + * was locked. The console_srcu_read_lock must be taken to ensure + * the console is usable throughout flushing. + */ + cookie = console_srcu_read_lock(); + if (console_is_usable(con, console_srcu_read_flags(con)) && + prb_read_valid(prb, nbcon_seq_read(con), NULL)) { + __nbcon_atomic_flush_pending_con(con, prb_next_reserve_seq(prb)); + } + console_srcu_read_unlock(cookie); } EXPORT_SYMBOL_GPL(nbcon_driver_release); diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 9cdc110a46a2..8c93ef6292ac 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -3172,6 +3172,8 @@ void console_flush_on_panic(enum con_flush_mode mode) console_srcu_read_unlock(cookie); } + nbcon_atomic_flush_pending(); + console_flush_all(false, &next_seq, &handover); } -- 2.39.2