From patchwork Tue Sep 19 23:08:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Ogness X-Patchwork-Id: 142134 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp3772964vqi; Tue, 19 Sep 2023 17:23:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHMUq5PjH3i8Mz+YQAbdzuRGIkFcgK6gkztasWRguUPB8IKIgVbqi3vU1A7As245tnB4e0D X-Received: by 2002:a05:6a00:1915:b0:68f:da2a:637b with SMTP id y21-20020a056a00191500b0068fda2a637bmr1353845pfi.19.1695169399550; Tue, 19 Sep 2023 17:23:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695169399; cv=none; d=google.com; s=arc-20160816; b=BZoCIbvL5DghPeDdkg5fk5cpLGQdi7wcZv2YUQudi2MFNPlmQmufYnWDqBX8rvEjHM ErYwKJS9ZVySCxoqoZoT9Dn6WuW5WLDO1pSP/sKcEahJN1tukvT8eViF4ih1cPxo6a4K 6CX2Xl56MiphtCrMJMFtcqeZOCA44pktXvxZD7VdfmDd65rkZnFhZTfgQhtUJT3cu0No AQn+LnteoCZbNqHKokf6a/neNZIvDomD0b2twFrA4qmMFcLfx1AiTohExGgOhRfXl88T s8c+2q6zOc/58dhZREtVZcUQIAuwJCTzaPBAxmQMljvJHKAO6fGnqdCLJynQyqJz9Iq4 MMMw== 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=fFf1kFlBgEjf3N0WbcHTHhbAP/Zmjn3VBhye6lfUWfg=; fh=pKnPKUsir0uEGSsor+4Zc2vgbu+g+ayvUgsdzkuXaoA=; b=CK1nhvj/+LNfKPEjbDAoMyS5tiYehBqsIO+3tfW5HfGTMDZy5l1POtdSNrGUX1nIOb jBmAomc3hFjjYp+i0PQY/6dncH+rJx2f2bByN8485b6LhyrnoxVbbXeTRipt8FLigmdA doyXu5KoogMb5svnZ+u+aealFrr0IFGUfKBZ1hMY2oIAXpzc4JdUBNFL8eTD0I56ZTUG VvhPwr5QkoiO3PBoB76I50AyuPgms1wIdLB0VqPb/9TDFcoBlzOJf9kHQ2X9cODfpcff vGrGqCWZKdptscN0eBVkoPWJ0iY1o29cw6ao4kzEVRioXIaeokFWjcIWojUcv/hqKDlK hqeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="Ji/Nc38y"; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id bt10-20020a056a00438a00b0068e4358d041si10458689pfb.175.2023.09.19.17.23.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Sep 2023 17:23:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="Ji/Nc38y"; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id D9EF382A8567; Tue, 19 Sep 2023 16:09:26 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233502AbjISXJW (ORCPT + 26 others); Tue, 19 Sep 2023 19:09:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233128AbjISXJQ (ORCPT ); Tue, 19 Sep 2023 19:09:16 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9368C4 for ; Tue, 19 Sep 2023 16:09:10 -0700 (PDT) From: John Ogness DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1695164948; 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=fFf1kFlBgEjf3N0WbcHTHhbAP/Zmjn3VBhye6lfUWfg=; b=Ji/Nc38yfLVaVLklKC8ElmecwukK9eYHd/xy+zRdEHUz1FlAV5pEXIJiRvrf92e6/AffdU 3xSJZ9Rmc45lH6uh0CZvwv6VUYkSCGWl8Y3muVrFyNtA9tMp3vgrGqkpU2otzGFlzyPrnU aF72eJLOGgDavU7eZAugt5TQywfa+A4gIBvhsrh2MooZO735vePLxRGKGQZON7CSknjmWt G46xk49I3KWLkkVTzifElnnaTT13vJjniJlmQTeEwB2dGAQtzrlQ3jxX2ZBJIVf+RzXI2v jiSMfDQLTD2/3kQC1xOiLdWgn3W+w9Z9vKc0aOesag4So0OJvmSeaSf9EB8GqQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1695164948; 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=fFf1kFlBgEjf3N0WbcHTHhbAP/Zmjn3VBhye6lfUWfg=; b=X8lELKW72ir/HEJ6adxk6nez4Z4oqG/cjZChnCPxzeFYkIeq3RqfDNN27LHnpOW3wYlgjY M5XJwZRtIwTzaFDw== To: Petr Mladek Cc: Sergey Senozhatsky , Steven Rostedt , Thomas Gleixner , linux-kernel@vger.kernel.org Subject: [PATCH printk v2 02/11] printk: Let console_is_usable() handle nbcon Date: Wed, 20 Sep 2023 01:14:47 +0206 Message-Id: <20230919230856.661435-3-john.ogness@linutronix.de> In-Reply-To: <20230919230856.661435-1-john.ogness@linutronix.de> References: <20230919230856.661435-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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Tue, 19 Sep 2023 16:09:26 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777513948351843871 X-GMAIL-MSGID: 1777513948351843871 The nbcon consoles use a different printing callback. For nbcon consoles, check for the write_atomic() callback instead of write(). Signed-off-by: John Ogness Reviewed-by: Petr Mladek --- kernel/printk/internal.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/kernel/printk/internal.h b/kernel/printk/internal.h index 6e8c1b02adae..69c8861be92c 100644 --- a/kernel/printk/internal.h +++ b/kernel/printk/internal.h @@ -80,6 +80,8 @@ void nbcon_free(struct console *con); /* * Check if the given console is currently capable and allowed to print + * records. Note that this function does not consider the current context, + * which can also play a role in deciding if @con can be used to print * records. * * Requires the console_srcu_read_lock. @@ -94,8 +96,13 @@ static inline bool console_is_usable(struct console *con) if ((flags & CON_SUSPENDED)) return false; - if (!con->write) - return false; + if (flags & CON_NBCON) { + if (!con->write_atomic) + return false; + } else { + if (!con->write) + return false; + } /* * Console drivers may assume that per-cpu resources have been