From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 567003A4F30 for ; Thu, 23 Apr 2026 13:01:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776949272; cv=none; b=VZFGQviRtNhxaIfudCL1uOZ/vLLPMdt+6hREArYgNPXNTnscPU33HcwGjwnXXlnrW6btH9e7QxwLSC9KBKsyBTobjgOxitMjzXA++8eeRcUJ/wekK6YayvkieY17pzPKQXoc7rCWtsvdEtEsfH9gg7m8U8hX8fYmer4J969/32A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776949272; c=relaxed/simple; bh=g95LC9VMza4PBvjpnZ4SS4ap5tSNtU6yyCGT7+TbMPA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=J4VSs1pVmNQjk8dyYWLA2CYSEbb28fmq3aU9D2K8JjmZWcs6HJ5Lsn+ZW+G3FfZZxMK54EKc+znPtsJU8oLiPgzyNWzAF0+1htCEwe4tWw/wdjs9dCJENh8aHiFEV6kGDoUaKKh7+OwcFmNW+6cAFGFkYq7pom6TrSW8agqx1LE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=S9bnNKIJ; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="S9bnNKIJ" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-4891d7164ddso28434555e9.3 for ; Thu, 23 Apr 2026 06:01:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1776949269; x=1777554069; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=V7eltpM4g30RwxCpVsv7pO4pBcBmlOR808n2PdluT1A=; b=S9bnNKIJkjFgyuigbQQPT8Xo6q1PhnTxuozCS/VAjZQ4OJFJj/gJbko62+TSWXbvxe oNuf7FL03Cr+8csDJ2CQd+TNyv1v/PreENVHBYk+w4z8mIGGOvIal2g2OyDRJY7A/4i+ LRBrq/Gui5kjdws3k40oazIMvGhmU9kzaJPtfj/B9oB7WRoe281BvfFsam4ITKyaD9IP W6PSueAnjnSHuYDHFmnv1ipXktx5pk5rIoL83AS/eeHf/c9shdUWUQBVRsyY8tSRjKA7 ULoG8D8wPfmc3JEQNH79PtWXmPxc0xnZ7zhG0fjpvS6ojwTU+tBqLZgAwccYccwcJpKV Rgxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776949269; x=1777554069; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=V7eltpM4g30RwxCpVsv7pO4pBcBmlOR808n2PdluT1A=; b=YrbZrZUgDxXVehvFsKUqCrQFW8Yrsy2Hbz4TT1iTiV+IjeOBx8NtaDQGjL7IBJwaNY xaSemhKhBf5mS9PSPXyEsCQCyOJ0C2S3JXcg/0xqPNhyKyGOkL/V0B0C/sGKsiCL0YVl 5pz6GnYc2q3L6Riq7Z/AcWuXKxov+PL726j8rWNlkRqTr6+nsY1f6Vn/W6IB9ygpv/gy qmoyB919KZs2F95MxffL6bWQhsTBIUMSIdOLVMeyolLBM3fE6AkkuTaiNTaY88O78lzM KA0PsdeuYU5aqUwnVsVFAgRrpPBoXtPQwTEcWb+1lHGESOX+fVtws63cIr4tG8kocsQj PjJw== X-Forwarded-Encrypted: i=1; AFNElJ9DKJjPL6ZODW/Z48MDUpVa1NVODYUzqLvBg5u9bw5cZ5dfwgKEe4/iEEMOksysgAvSKw5Z4uP+SzMfo7c=@vger.kernel.org X-Gm-Message-State: AOJu0YwJl/BJMpKp1yJAXKzU8EGf0QXfzDfXWnsnvKCIA3dEwlMZ0Tzv UFBAzhYhNm7a/oo7LzFYOmJpE/5Mi3g91U5fz08U8rwqADJbzv5LolFgm8BZnxflXzi4f8tpM7O XGrzqr74= X-Gm-Gg: AeBDieu40PhUm3HJbzLOnSP2R4THOFu+ibKY5uFhnEmCHth/+pLFXDE9gUXIN8jGyly umh2PFfC39XXi7aioEaQdq8muA3whlR6I9ZZVxdowB2VeemzdVFYOscoeE4HamcKX9uDa307+Gp ozR262NxeNnkg7kYs/avRkmaRIXYr7nq2x1U8TBreyLxxRE0wy3kZzOL4XC/qui/cYrmpREj3kE KbJem+bDg10wnZHrqvIP65gB5yW8DgXSsnLdiuHqwm6XVYpJqvWILSCE9MKz3Hbp8qAMDAPA3q+ EeylnwurwOQD7zQEzvgSO+RHQ1fnrDYfXuNjFLK8YD4YHxByMDJ2DNEDOF0ASdJ1BFwyYqnnin0 14EJrKiJiErHbgDI/djLytKa4DBrFbbQ3yJgbJRw70IRusbKLNoayT2Bor2OdTj1a2QkairiwG9 kaqoC7ggWHS7jOxrbZz8aawa49h/E6mToyUXat X-Received: by 2002:a05:600c:4e4f:b0:488:ab37:b442 with SMTP id 5b1f17b1804b1-488fb793c6bmr396900095e9.28.1776949268469; Thu, 23 Apr 2026 06:01:08 -0700 (PDT) Received: from pathway.suse.cz ([176.114.240.130]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-488fc14a61asm482717835e9.15.2026.04.23.06.01.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2026 06:01:07 -0700 (PDT) From: Petr Mladek To: John Ogness Cc: Sergey Senozhatsky , Steven Rostedt , Marcos Paulo de Souza , Chris Down , linux-kernel@vger.kernel.org, Petr Mladek Subject: [PATCH v2 3/9] printk: Separate code for adding/updating preferred console metadata Date: Thu, 23 Apr 2026 15:00:08 +0200 Message-ID: <20260423130015.85175-4-pmladek@suse.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260423130015.85175-1-pmladek@suse.com> References: <20260423130015.85175-1-pmladek@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The logic for adding or updating a preferred console is currently duplicated within __add_preferred_console(), making the code difficult to follow and prone to consistency issues. Introduce update_preferred_console() to centralize the initialization and updating of struct preferred_console entries. This refactoring explicitly defines and enforces the following rules: 1. Console names and/or indexes are not set when a console is preferred via devname; these are resolved later during device matching. 2. Console names are only added alongside a valid index. 3. Only matching entries are updated. 4. Console and Braille options are never cleared. They are updated only via the command line. 5. The global 'preferred_dev_console' index and 'console_set_on_cmdline' flag are updated consistently. Additionally, rename braille_set_options() to braille_update_options() to better reflect its conditional behavior. Behavior change: The original code never updated the preferred console options when it was preferred more times, e.g. via the command line and/or some platform specific code, e.g. SPCR or device tree. The new code explicitly allows to update the console options when they are preferred over the command line. It mostly worked even before but only because the command line was processed early enough before handling SPCR, device tree, or other platform specific init code. The main behavior change is when the same console is preferred more times on the command line. Newly, the later or Braille variant wins. It is a more common and expected behavior. Signed-off-by: Petr Mladek --- kernel/printk/braille.h | 7 +- kernel/printk/printk.c | 149 ++++++++++++++++++++++++++++++---------- 2 files changed, 118 insertions(+), 38 deletions(-) diff --git a/kernel/printk/braille.h b/kernel/printk/braille.h index 55cd3178a17a..0bdac303f8b1 100644 --- a/kernel/printk/braille.h +++ b/kernel/printk/braille.h @@ -5,9 +5,10 @@ #ifdef CONFIG_A11Y_BRAILLE_CONSOLE static inline void -braille_set_options(struct preferred_console *pc, char *brl_options) +braille_update_options(struct preferred_console *pc, char *brl_options) { - pc->brl_options = brl_options; + if (brl_options) + pc->brl_options = brl_options; } /* @@ -29,7 +30,7 @@ _braille_unregister_console(struct console *console); #else static inline void -braille_set_options(struct preferred_console *pc, char *brl_options) +braille_update_options(struct preferred_console *pc, char *brl_options) { } diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 13c98285892b..d251bf8e104f 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2544,18 +2544,119 @@ asmlinkage __visible void early_printk(const char *fmt, ...) } #endif -static void set_user_specified(struct preferred_console *pc, bool user_specified) +/** update_preferred_console - Update a given entry in the preferred_consoles[] + * table. + * @i: index of the entry in @preferred_consoles table which should get updated. + * @name: The name of the preferred console driver. + * @idx: Preferred console index, e.g. port number. + * @devname: The name of the preferred physical device. + * @options: Options used when setting up the console driver. + * @brl_options: Options used when setting up the console driver + * as a braille console. + * @user_specified: True if preferred via the kernel command line. + * + * The function ensures that the given values are consistent. Also + * it updates some global variables which are used to make the right + * decisions in register_console(). + * + * Rules: + * + * 1. Either @name and valid @idx OR @devname and @idx=-1 are allowed. + * Note that a valid @name and @idx will get assigned later when + * @devname matches during the device initialization. + * 2. Specify @brl_options if the console should be enabled as + * a Braille console [*] + * 3. Only matching entries can be updated. + * 4. @options passed via the command line are used when the same + * console is preferred also by some platform-specific code. + * + * [*] Braille console is using the mechanism for registering consoles + * but it is very special. It is primarily used for user interaction + * with the system. It neither gets printk() messages nor is associated + * with /dev/console. + */ +static int update_preferred_console(unsigned int i, + const char *name, const short idx, + const char *devname, char *options, + char *brl_options, bool user_specified) { - if (!user_specified) - return; + struct preferred_console *pc; + + if (i >= MAX_PREFERRED_CONSOLES) + return -E2BIG; + + pc = &preferred_consoles[i]; + + if (!name && !devname) + return -EINVAL; + + if (devname) { + /* + * A valid console name and index will get assigned when + * a matching device gets registered. + */ + if (name) { + pr_err("Adding a preferred console devname with a hard-coded console name: %s, %s\n", + devname, name); + return -EINVAL; + } + if (pc->name[0]) { + pr_err("Updating a preferred console entry with an already assigned console name via devname: %s, %s\n", + devname, pc->name); + return -EINVAL; + } + if (idx != -1) { + pr_err("Adding a preferred console devname with a hard-coded index: %s, %d\n", + devname, idx); + return -EINVAL; + } + + if (!pc->devname[0]) { + strscpy(pc->devname, devname); + pc->index = idx; + } else if (strcmp(pc->devname, devname) != 0) { + pr_err("Updating a preferred console with an invalid devname: %s vs. %s\n", + pc->devname, devname); + return -EINVAL; + } + } + + if (name) { + /* A console name must be defined with a valid index. */ + if (idx < 0) { + pr_err("Adding a preferred console with an invalid index: %s, %d\n", + name, idx); + return -EINVAL; + } + + if (!pc->name[0]) { + strscpy(pc->name, name); + pc->index = idx; + } else if (strcmp(pc->name, name) != 0 || pc->index != idx) { + pr_err("Updating a preferred console with an invalid name or index: %s%d vs. %s%d\n", + pc->name, pc->index, name, idx); + return -EINVAL; + } + } + + if (!pc->options || (user_specified && options)) + pc->options = options; + + braille_update_options(pc, brl_options); + + if (!brl_options) + preferred_dev_console = i; /* * @pc console was defined by the user on the command line. * Do not clear when added twice also by SPCR or the device tree. */ - pc->user_specified = true; - /* At least one console defined by the user on the command line. */ - console_set_on_cmdline = 1; + if (user_specified) { + pc->user_specified = true; + console_set_on_cmdline = 1; + } + + return 0; } static int __add_preferred_console(const char *name, const short idx, @@ -2563,19 +2664,11 @@ static int __add_preferred_console(const char *name, const short idx, char *brl_options, bool user_specified) { struct preferred_console *pc; - int i; + unsigned int i; if (!name && !devname) return -EINVAL; - /* - * We use a signed short index for struct console for device drivers to - * indicate a not yet assigned index or port. However, a negative index - * value is not valid when the console name and index are defined on - * the command line. - */ - if (name && idx < 0) - return -EINVAL; /* * See if this tty is not yet registered, and @@ -2584,28 +2677,14 @@ static int __add_preferred_console(const char *name, const short idx, for (i = 0, pc = preferred_consoles; i < MAX_PREFERRED_CONSOLES && (pc->name[0] || pc->devname[0]); i++, pc++) { - if ((name && strcmp(pc->name, name) == 0 && pc->index == idx) || - (devname && strcmp(pc->devname, devname) == 0)) { - if (!brl_options) - preferred_dev_console = i; - set_user_specified(pc, user_specified); - return 0; - } + if (name && strcmp(pc->name, name) == 0 && pc->index == idx) + break; + if (devname && strcmp(pc->devname, devname) == 0) + break; } - if (i == MAX_PREFERRED_CONSOLES) - return -E2BIG; - if (!brl_options) - preferred_dev_console = i; - if (name) - strscpy(pc->name, name); - if (devname) - strscpy(pc->devname, devname); - pc->options = options; - set_user_specified(pc, user_specified); - braille_set_options(pc, brl_options); - pc->index = idx; - return 0; + return update_preferred_console(i, name, idx, devname, options, + brl_options, user_specified); } static int __init console_msg_format_setup(char *str) -- 2.53.0