From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (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 6D1BE202963 for ; Thu, 4 Jun 2026 10:15:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780568161; cv=none; b=I8GN/jVpCVJUWHvtXmBLG3PyKb9P4ZAVRpUoZ1KES7vR3637Gw6d7s6ttiwEtTaLgOqKIJeUW4RYkI41q3rCJUk9JiAvGR2qmyy7OlDFo+r1i7lmYDZX0OgkxNGP2OBmaxt9eNpPtgSMsVZ9kJPDJVU0fdMBcBJun5WOEz2eK+Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780568161; c=relaxed/simple; bh=u0r2/NOEJXm5YiZGZN67/Pj5cyou6Ya5Uo8MlDCjWtc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Cb+1vv+hXWQsrDaXHLEG0JSwhB/HYsQ5hh96aREeoOy0iUGMAZfveYVH9IyRk7qSb9kKg5esUf1MdNGMv8rkhAhcSxkOFyJN5Oi4YVQf4TVYVTTsEqmlY/HyzRdkVxtCJQ/2u2bPV7mF3HvHd28pGBhKptYClB/u5hgjXZzQGkQ= 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=BnwNuLN4; arc=none smtp.client-ip=209.85.221.53 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="BnwNuLN4" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-46019edc13dso253387f8f.1 for ; Thu, 04 Jun 2026 03:15:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1780568158; x=1781172958; 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=AQVYOmOVM1Z0u9gQ0UIAJfJqJI6MAk0H44mTuTI8sK4=; b=BnwNuLN4rdDQC4H9CdOL9ThtXn/n6K0/3Gx0HiB2L73n3KW9yh/2j5DIfpS7u3FtbB Dbe7KqWAmZ+aWngIsSQuyTA8Yllm2YgBltiLPaFsDQIcW1fCX5xpnD3oyBVxeqQ3HE0G Pj/aGZ4/Cf2fALN9m9rA5+QfkHRjvP4PgcmokT+sPhmsCc3jPIU9h97bDTnornp+MKm/ 13WSZlpukSyC52fUuI832PMEvZfKI9F9/bPCyLmJrAcvT8o3W2xbSrQnclEHNlKgbHln aS8kXy5K+nn7IyshzL1uh5Rs6lZfGNcsfe0kuc3ibVAcNxpI9MuD2k5HTmVX/oF+TI0k QUOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780568158; x=1781172958; 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=AQVYOmOVM1Z0u9gQ0UIAJfJqJI6MAk0H44mTuTI8sK4=; b=JLkZGWm5DFzdof88Z8esTIIvooAmc8xxpwuvpxereoqCp8mAe8UeK0vEuDCPOEcb+l VJ8dkxSE4Kl1EJimzkGeT8LPkumph66T/ZfyypjhSnui3LBV53ePIrVCWPF+esYXGGQf wD/xaRIZvzI75kbMoiIzVzL+/MmtPKZZHMPUNI+Zs8T2z8YqeOyAP0ueka9XecUcFPkb j9NGpJHCq1WfqLg7DUV1uW+x4NI8VOl2tLCrFvU6A/NterdAqUyd5SeUWwmWXBoMe6JQ fVEmDoSsck5RwlvNjSKpdHWvGRRLSx6P5MDdakueuc99MM2i6n/8tKba5vt2kxECDyE3 IspA== X-Forwarded-Encrypted: i=1; AFNElJ+Jh4xQzLKfpOQc2x7S36b2K4ox2MYYJa0AQ3oqo6QYlwSf5j4sllZNSjTXYI31w1mfcvMbQUbBXBfXFzk=@vger.kernel.org X-Gm-Message-State: AOJu0Yw43RrUIucfu9MkuMObUUJzsiyB8udrzOlho/VfH+tGQ7RNYTIC 1KRlvK20Zq0jK19coRYPH1yofq7EdPwseS3YBC2vTeGbv3nibBDulrrPlXDX75ts6is= X-Gm-Gg: Acq92OH+4uaD0D+D1ZN8UNci3kYs9onUEZozsXWbVekp5Mh6QztwKJbExUz5Ujwyivi gxd4YN+75KgJAqqtdTe686NBmi+YPpWeC5+MHfcFvPbLdrxOzJpbPhMuvWjXYPl96fCme4iaksR Y7d5uwW9sdZ5aoe0S7+s3sNHAhNajqxZeQR68PPLNanTczaNfl6kJ98sMl8p856vaaTDf61G/vq 5IRKRvkrNxzH9N0mzkTxOSMVbw+3avo+5SnKXaqxmDqSfo83whSZoFE+PKmqQX+qOw8DJ9T37Z8 MAeLl5T1yukL9dnX4K12x1sZi79oZv0nl0simk9zqP9Hwk+wya17zMx1GtUWMoPZzYIUc3NEatJ 98PoB2JxCCPVa8vXDZub99VZVsfbhTaPHlHar8fzs0mxX/W3v3FD75t8bJikUS44/gLlSZ5I+yY cgDD0sX+ksE1QFVpq7D388ZAQqWpNwP41FEaeT X-Received: by 2002:a05:6000:2401:b0:43b:5097:6f62 with SMTP id ffacd0b85a97d-46021760f85mr11617971f8f.36.1780568157787; Thu, 04 Jun 2026 03:15:57 -0700 (PDT) Received: from pathway.suse.cz ([176.114.240.130]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4601f2e4004sm15200176f8f.9.2026.06.04.03.15.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jun 2026 03:15:57 -0700 (PDT) From: Petr Mladek To: John Ogness Cc: Sergey Senozhatsky , Steven Rostedt , Marcos Paulo de Souza , Chris Down , Naveen Kumar Chaudhary , linux-kernel@vger.kernel.org, Petr Mladek Subject: [PATCH v4 04/11] printk: Separate code for adding/updating preferred console metadata Date: Thu, 4 Jun 2026 12:14:51 +0200 Message-ID: <20260604101459.393162-5-pmladek@suse.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260604101459.393162-1-pmladek@suse.com> References: <20260604101459.393162-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 | 153 +++++++++++++++++++++++++++++++--------- 2 files changed, 122 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 e162e8836683..b7dbbc1baeb1 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2544,18 +2544,123 @@ asmlinkage __visible void early_printk(const char *fmt, ...) } #endif -static void set_user_specified(struct preferred_console *pc, bool user_specified) +/** add_or_update_preferred_console - Add or 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 add_or_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) { + pr_err_once("Reached maximal number of preferred consoles.\n"); + return -E2BIG; + } + + pc = &preferred_consoles[i]; + + if (WARN_ON(!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]) { + /* This is a new entry. */ + 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]) { + /* This is a new entry. */ + 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 +2668,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 +2681,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 add_or_update_preferred_console(i, name, idx, devname, options, + brl_options, user_specified); } static int __init console_msg_format_setup(char *str) -- 2.54.0