From patchwork Fri Aug 30 15:29:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Ogness X-Patchwork-Id: 13785258 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 90A061B81C8; Fri, 30 Aug 2024 15:29:28 +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=1725031770; cv=none; b=G1fyfgKS8E3LE410sKqoSz5qnfoJJUV5mmDimR+TO7bKtgwsWVOUDI7t43w2WEyFfi4HYebgi+7UU7/i7hi2ixH8x8exI2uYK7fepmwT7NUiN5UJ8RERozd1+rGZAx268erXQqHZy+5+gXZX5HiSw0Of8qaGLm5r3ATIx8pCx4M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725031770; c=relaxed/simple; bh=z7t14psmClgJPnrTS3FePajFlnKKHKwtWJNjr7MCP1s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=beLn/asMseaeZYeWuM1aCSFaDSWE5e2n81nZC+j8OXiwcIqDPm+5/OGWngaf6hHH9Y5rrMOlnSl3DK+trMTeboOvId51KOBCwfQmdfFa1sIVMfkXpzlkn1rOexmcyL2kozTfepW/7qtAofFHs+cLTtxZW7J8drzugyKu0W8teEs= 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=AhPQ4/Yb; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=bXjWNwX2; 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="AhPQ4/Yb"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="bXjWNwX2" From: John Ogness DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1725031761; 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=u1Oi5xduOOsbRA26g1GCX0jTw6STXCrfhNtn4TB0hdM=; b=AhPQ4/YbnRSYX4pxChB3fh7UI8eXL78WxqmtKljMc+kv4/bbX33gtmG2vIasuPf8+x/PGl Cb+9D2pG809ZcAuSxEhm4tM90KlakS+IQ5DDBXRBEUJPP83CExlUctayfMxjibudw/aRoy V+oVEVfZRex1E4M3GmjsyLnbKKQNykyIfAGdCE7yXdZorQ0QbEY4f0/7xmp8adEjkYxntN hrH29QXqTmLaJOyTvhOIKeeLjO1mAn2Tem1nPXYdwYqzR90doRDfs8PXoqPOvqm8tW85Tz PHPdATj4tSKNUycP9jgzfP9NhQ7ANLH85UzIfqYHBBgTmg5VQ8ONLwUCJFIbSg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1725031761; 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=u1Oi5xduOOsbRA26g1GCX0jTw6STXCrfhNtn4TB0hdM=; b=bXjWNwX2LfGnK3EeHs2nLrCjHY04PI6gjMaRBS/hleAuB6BPV//wGEMBaqQAgd2a+pez0O GzI546dbUlG/TmAQ== To: Petr Mladek Cc: Sergey Senozhatsky , Steven Rostedt , Thomas Gleixner , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH printk v5 12/17] proc: consoles: Add notation to c_start/c_stop Date: Fri, 30 Aug 2024 17:35:11 +0206 Message-Id: <20240830152916.10136-13-john.ogness@linutronix.de> In-Reply-To: <20240830152916.10136-1-john.ogness@linutronix.de> References: <20240830152916.10136-1-john.ogness@linutronix.de> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 fs/proc/consoles.c:78:13: warning: context imbalance in 'c_start' - wrong count at exit fs/proc/consoles.c:104:13: warning: context imbalance in 'c_stop' - unexpected unlock Signed-off-by: John Ogness Reviewed-by: Petr Mladek --- fs/proc/consoles.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/proc/consoles.c b/fs/proc/consoles.c index e0758fe7936d..7036fdfa0bec 100644 --- a/fs/proc/consoles.c +++ b/fs/proc/consoles.c @@ -68,6 +68,7 @@ static int show_console_dev(struct seq_file *m, void *v) } static void *c_start(struct seq_file *m, loff_t *pos) + __acquires(&console_mutex) { struct console *con; loff_t off = 0; @@ -94,6 +95,7 @@ static void *c_next(struct seq_file *m, void *v, loff_t *pos) } static void c_stop(struct seq_file *m, void *v) + __releases(&console_mutex) { console_list_unlock(); } From patchwork Fri Aug 30 15:29:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Ogness X-Patchwork-Id: 13785259 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 B84611B86D9; Fri, 30 Aug 2024 15:29:28 +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=1725031770; cv=none; b=Fcl5BAjO1vVhrp57PADeTx+5EhAer6uaiL9w/WEyTykLlRLFeherc9Sc2uIvtT9Uih4b+9dbHQyMMwSvqvVDmgFwMrgFhxBgqWhJU17BzZnz4B9fTpveevZg0PGurWcelwSzzjizevliaKpGDwMwOKm22xtDybrgbKtpoUybNcg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725031770; c=relaxed/simple; bh=RuhFMyH0buaWaNTtg4qur9A9+lQbBJQXU2dz3dvH8mI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JMJ9nlvs+emYtyL0dzWzPd8xhWfFOi03xSmE0NGY06IWgVHg7s3u0c1YGkUpOKByP9jGx5oFxtO83E2kUDl+n9l0ItvIQOU1ViOwei6PPc0mCcu6ZLHuB7hqDJeWzWYUcd1aIfZvToEsxGSbHdSmdC1OAfDQRxi+IIA2xkF4Xis= 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=FchdMTmy; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=c2WSGed7; 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="FchdMTmy"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="c2WSGed7" From: John Ogness DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1725031761; 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=SlCaONAJqxgKpAXbE82io/gLxoDWz0lN5rgg6CE37cM=; b=FchdMTmyntoPE7akPOtsgrfdHuBqrDJVN0oI+pRsJok/wa/pBzXOwGm3B+PC/OACeYjw+U f4NBDeH3pXYkZCNjDJWnU1VImFI4OjMrtEE8aMF62I1DeNgt6WtwWiZj3XOt7oJalrLVRM UWu9BbWLKeFuL28bjtemoRZlChrDFsHM3UfrQ0HPJ1m+V3IGLKPOYXnXfD+CYcUkzyUJn7 VJuaegyjVRwobtkyou4Zuy568u+GwLDaQNRrKoEY1eGXiWDl4BXBekDgw2R+8OB3ezQSDt 0OD3uUq/NlViMbkwe4X5mWyrYgcVeI8yrbom01ZhJ5zy3OcehjhkPkfCyrrY0Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1725031761; 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=SlCaONAJqxgKpAXbE82io/gLxoDWz0lN5rgg6CE37cM=; b=c2WSGed7ScXWBb2EWRODhDJNAc7E/zEgqm/ph1ozdffPcqNpXrD+CovpdM3jjaZWTKTRnN NE7961cuiQrnveBA== To: Petr Mladek Cc: Sergey Senozhatsky , Steven Rostedt , Thomas Gleixner , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH printk v5 13/17] proc: Add nbcon support for /proc/consoles Date: Fri, 30 Aug 2024 17:35:12 +0206 Message-Id: <20240830152916.10136-14-john.ogness@linutronix.de> In-Reply-To: <20240830152916.10136-1-john.ogness@linutronix.de> References: <20240830152916.10136-1-john.ogness@linutronix.de> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Update /proc/consoles output to show 'W' if an nbcon console is registered. Since the write_thread() callback is mandatory, it enough just to check if it is an nbcon console. Also update /proc/consoles output to show 'N' if it is an nbcon console. Signed-off-by: John Ogness Reviewed-by: Petr Mladek --- fs/proc/consoles.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/proc/consoles.c b/fs/proc/consoles.c index 7036fdfa0bec..b7cab1ad990d 100644 --- a/fs/proc/consoles.c +++ b/fs/proc/consoles.c @@ -21,6 +21,7 @@ static int show_console_dev(struct seq_file *m, void *v) { CON_ENABLED, 'E' }, { CON_CONSDEV, 'C' }, { CON_BOOT, 'B' }, + { CON_NBCON, 'N' }, { CON_PRINTBUFFER, 'p' }, { CON_BRL, 'b' }, { CON_ANYTIME, 'a' }, @@ -58,8 +59,8 @@ static int show_console_dev(struct seq_file *m, void *v) seq_printf(m, "%s%d", con->name, con->index); seq_pad(m, ' '); seq_printf(m, "%c%c%c (%s)", con->read ? 'R' : '-', - con->write ? 'W' : '-', con->unblank ? 'U' : '-', - flags); + ((con->flags & CON_NBCON) || con->write) ? 'W' : '-', + con->unblank ? 'U' : '-', flags); if (dev) seq_printf(m, " %4d:%d", MAJOR(dev), MINOR(dev));