Received: by 2002:a05:6602:18e:0:0:0:0 with SMTP id m14csp5865507ioo; Wed, 1 Jun 2022 14:26:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSd9owJw4jGa4QJYj4eiQF/sUK7p1Ey8ee9SRj3y7agNQlm546mNb+0eGa4BUDW+njvyRh X-Received: by 2002:a17:90b:3910:b0:1df:e147:6d85 with SMTP id ob16-20020a17090b391000b001dfe1476d85mr1466735pjb.18.1654118785106; Wed, 01 Jun 2022 14:26:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654118785; cv=none; d=google.com; s=arc-20160816; b=GcHMe0RGx083CE2bgVOO7LHcHIkKT0JxXn0SQ5yb5lk8CsXGY6tvOZI6Oe/oqKgSl3 v2sKhaY02mi7iWdVS17I80GO6/+DiE2Nqc9XO8E8atTLKRJx8gcyjIKx9IqWmLDo06m/ QVsUu4ggbqXwHhBNOjhlDADhbC/3NQdq6IwTmQnLtMYT0yo2g+YuJKo84L8n5uyIfdG5 JsTNLNAD2rr6solVLVud2K/thhAXRaMkRW+NShlIJtRwLNGiSi1ZDtBtfmY+OryF0qkB 8SKyOD7zpDIRpC6N760y2OS8daB8gHMHiK5omRPC8quRN21us0opVabo8tCa1SRlBMRD ZiUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=W1RWuAKFWEZuUeqdAFkv3JsItDIF0JJyFijfVCbYH7A=; b=pzg7sXRZjYlEuNXRgGXNBq+mDWPF4R/7egHruntcG5Sx2sLh8FAC2IN6F74zr1UCYn 5GTwm4W7hr1S4qBYA5N3FW1GFwH13mWlO9douvkDKaLCeRxh3buH8q0a3oDcNINEWhMd vAw03ad8x9RS6zmD1+llYXa82l2Iz5CinOjMh++19bdQJT41D2ZDlruifUh/dgbsZ8L+ 0ByL9xVUmbsTlPWO0Bwr5CSWQCPYVKzRbJ/OldOd2PhLsrbcFU6Uw5tddhl9eR7gFa69 R7CD9ctj/758+Dy5MzneUBlgiOBxqxWU/0vT8wyQi/3wJJooDOojQntipVW2bVeUeO16 f+ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=WHkkOOsy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id j13-20020a056a00234d00b005108b38be1csi4365755pfj.80.2022.06.01.14.26.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 14:26:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=WHkkOOsy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E40F423BC1A; Wed, 1 Jun 2022 13:16:40 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354817AbiFAQjV (ORCPT + 99 others); Wed, 1 Jun 2022 12:39:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346345AbiFAQjU (ORCPT ); Wed, 1 Jun 2022 12:39:20 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 83066C52; Wed, 1 Jun 2022 09:39:19 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 30D75B81AE1; Wed, 1 Jun 2022 16:39:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B695AC3411E; Wed, 1 Jun 2022 16:39:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654101556; bh=fWLrh/QN73kWoUdn1uM9pU7LyWGvH2wBfUDPwPwOVpA=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=WHkkOOsyi5sF0GMLq5smDvwx4UulNBySXy79yI/fBpfzwZJqPh2/xjT5HMqi+i/I8 3sJ/eaKgt4Z6nDFnrABZTPfv8g12ZItJi/snZ+6BYx4Q0K5f+9RyYX7vs6geqp3617 T8pvcTwvfUsDhB4FKqx7RDontPuKJ6nOce9P7gljPmY3/3QbqKv6OClOsNirFNjsKX 2uyZed5JOJYKMsR8K5kSKnBiPjBOUhR1iM8O71TlJeV6D+uMDhl7Wt2tCJC6XLxOq4 XxU/0NV5sThtGrFFazDV6ZS5rThacmv0PEgeNf8rQ7tARkSNl9GxVtB07RdZwyAFwi pUB3urasWXHWA== Received: by mail-vs1-f47.google.com with SMTP id l13so786547vsi.13; Wed, 01 Jun 2022 09:39:16 -0700 (PDT) X-Gm-Message-State: AOAM532JwUC6IN0LGWc05uEQd9YO5ShqTdqmJv9N6mzpjPzud/drelSZ /1zLUmknsaB6O4BSbrjYMbvFT+XTwcy4WgUkNQ== X-Received: by 2002:a05:6102:1041:b0:349:cfa3:c029 with SMTP id h1-20020a056102104100b00349cfa3c029mr284503vsq.0.1654101555496; Wed, 01 Jun 2022 09:39:15 -0700 (PDT) MIME-Version: 1.0 References: <20220601135528.3176471-1-michael@walle.cc> In-Reply-To: <20220601135528.3176471-1-michael@walle.cc> From: Rob Herring Date: Wed, 1 Jun 2022 11:39:04 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH] earlycon: prevent multiple register_console() To: Michael Walle Cc: Frank Rowand , Greg Kroah-Hartman , Jiri Slaby , devicetree@vger.kernel.org, "linux-kernel@vger.kernel.org" , "open list:SERIAL DRIVERS" Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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 On Wed, Jun 1, 2022 at 8:55 AM Michael Walle wrote: > > If the earlycon parameter is given twice, the kernel will spit out a > WARN() in register_console() because it was already registered. The > non-dt variant setup_earlycon() already handles that gracefully. The dt > variant of_setup_earlycon() doesn't. Add the check there and propagate > it through early_init_dt_scan_chosen_stdout(). > > FWIW, this doesn't happen if CONFIG_ACPI_SPCR_TABLE is set. In that case > the registration is delayed until after earlycon parameter(s) are > parsed. > > Signed-off-by: Michael Walle > --- > > I'm not sure if this should have a Fixes tag or not. If so I guess it > should be the very first commit which introduced the support (commit > fb11ffe74c79 ("of/fdt: add FDT serial scanning for earlycon")). Considering no one noticed or cared in 8 years and that earlycon is supposed to be a debug option, I'd say no. > For the curious, here is the backtrace: > > [ 0.000000] ------------[ cut here ]------------ > [ 0.000000] WARNING: CPU: 0 PID: 0 at kernel/printk/printk.c:3328 register_console+0x2b4/0x364 > [ 0.000000] console 'atmel_serial0' already registered > [ 0.000000] Modules linked in: > [ 0.000000] CPU: 0 PID: 0 Comm: swapper Not tainted 5.18.0-next-20220601+ #652 > [ 0.000000] Hardware name: Generic DT based system > [ 0.000000] Backtrace: > [ 0.000000] dump_backtrace from show_stack+0x18/0x1c > [ 0.000000] show_stack from dump_stack_lvl+0x48/0x54 > [ 0.000000] dump_stack_lvl from dump_stack+0x18/0x1c > [ 0.000000] dump_stack from __warn+0xd0/0x148 > [ 0.000000] __warn from warn_slowpath_fmt+0x9c/0xc4 > [ 0.000000] warn_slowpath_fmt from register_console+0x2b4/0x364 > [ 0.000000] register_console from of_setup_earlycon+0x29c/0x2ac > [ 0.000000] of_setup_earlycon from early_init_dt_scan_chosen_stdout+0x154/0x18c > [ 0.000000] early_init_dt_scan_chosen_stdout from param_setup_earlycon+0x40/0x48 > [ 0.000000] param_setup_earlycon from do_early_param+0x88/0xc4 > [ 0.000000] do_early_param from parse_args+0x1a4/0x404 > [ 0.000000] parse_args from parse_early_options+0x40/0x48 > [ 0.000000] parse_early_options from parse_early_param+0x38/0x48 > [ 0.000000] parse_early_param from setup_arch+0x114/0x7a4 > [ 0.000000] setup_arch from start_kernel+0x74/0x6dc > [ 0.000000] start_kernel from 0x0 > [ 0.000000] ---[ end trace 0000000000000000 ]--- > > drivers/of/fdt.c | 6 ++++-- > drivers/tty/serial/earlycon.c | 5 ++++- > 2 files changed, 8 insertions(+), 3 deletions(-) > > diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c > index a8f5b6532165..7f3524213b43 100644 > --- a/drivers/of/fdt.c > +++ b/drivers/of/fdt.c > @@ -1025,6 +1025,7 @@ int __init early_init_dt_scan_chosen_stdout(void) > int l; > const struct earlycon_id *match; > const void *fdt = initial_boot_params; > + int ret; > > offset = fdt_path_offset(fdt, "/chosen"); > if (offset < 0) > @@ -1057,8 +1058,9 @@ int __init early_init_dt_scan_chosen_stdout(void) > if (fdt_node_check_compatible(fdt, offset, match->compatible)) > continue; > > - if (of_setup_earlycon(match, offset, options) == 0) > - return 0; > + ret = of_setup_earlycon(match, offset, options); > + if (!ret || ret == -EALREADY) > + return ret; Wouldn't just doing a 'return 0' here be simpler? The only other caller of this function doesn't check the error. Rob