From patchwork Thu Oct 5 12:36:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 148751 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2016:b0:403:3b70:6f57 with SMTP id fe22csp342826vqb; Thu, 5 Oct 2023 07:36:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGYH59PpgbH4nNDbi5cvL/TokU2r/QHtghjBNvmmHtoM4+lRbmWRe4+8c/1HrWWopjcN9kD X-Received: by 2002:a05:6a21:328a:b0:14d:7b6:cf2f with SMTP id yt10-20020a056a21328a00b0014d07b6cf2fmr6059522pzb.47.1696516615405; Thu, 05 Oct 2023 07:36:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696516615; cv=none; d=google.com; s=arc-20160816; b=moM+F+Kg7OrGJyNs+xtyzEbXwXw5bSU6CzCjDrZDCiZZgbj3EItmyGCLBxof9YJ46R xCM9WKzWAPH/bVaypRfBaW8QodhZQjGNngKVM+gLcykdyTEebIV59VEjyZiF1pmLKVf+ 3skKrQt9pIUIRr+za9f6UxNI0NwgZ7xzJAhGedfW56OC3wt1IRy0h71SkfW+O2DNrs1v D04LIxhAK5BPCSfegvEBNQ5NDmwgrRfbPgohQSxe/z6y8xLUYuXmt/LN+nn2UxJV4G2i Dk2qbU+IlVXqUgUHjHksGUS4FjQQh3ESFPgGIyCUQvQNIl/CJEM6JJRwtnM6tnf2jabI r08A== 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:from; bh=evoVQq8sZfXXqhKGthgDih8IbsSodAMl/ul/GSH8ebw=; fh=t3kfgQuaGyM84gKNjjnNISmg23a5dmENm6EBz3YSRHQ=; b=gorq0tUddwB1T+xecd96BdO4XuCXOirZ9HxaHoZuZqsUsjFOa3eYTguVWr4W4Rkecg 4aU1zTZmGI3nIgrFqRmoaCZSXV3y4cMB2PlSrJCFkaayCkMnuRNLOumehE18hf3d8Z/A rV5xaiN+lieOx2LkiECZbPBM2Okd6bhKV4ha/l8V+sUtfilLshbnafqwrQsLUwjaQX0K jdE/c59rQpIAQ+1gAoRpOFGcH38Hnhd1QDXuIL2fl4/msuNNWtdvtVU0R+acOwI8hRL9 Lm6qU6sV45JalPnyQaCxRivj2io5ix0sQO1WfJ3xgyBmqM4aB9ZSz89uHwBZ77MY8JXD yBLw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id q18-20020a056a00085200b00691019fd0efsi1603496pfk.75.2023.10.05.07.36.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 07:36:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 8CA9B80259C4; Thu, 5 Oct 2023 07:36:11 -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 S235573AbjJEOfp (ORCPT + 19 others); Thu, 5 Oct 2023 10:35:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235360AbjJEOeQ (ORCPT ); Thu, 5 Oct 2023 10:34:16 -0400 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49D6726A4C; Thu, 5 Oct 2023 05:37:13 -0700 (PDT) Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-536b39daec1so1538302a12.2; Thu, 05 Oct 2023 05:37:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696509431; x=1697114231; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=evoVQq8sZfXXqhKGthgDih8IbsSodAMl/ul/GSH8ebw=; b=sNzx7w5KPKtur6My5QhL+eb2fpJeXOQci7YtcpzPrkqnXhZYt4UfQBDHONkUDa6MC/ tIyfbo9gu9aJY9vY1u7f4FEfg/nfRUj7mRTvO55IeM8moySHXD+kua1ev7btZ3Ilqihg 3hdX958objluz4N2CxTes2OIZNFLFYq0PMmaG5EwIe8P6FxIBRvfdmZZnXNhmOBbgOTq Yyu5hUyJZeAkUOxkKxWm2jxLARhgksDJZ+d1QUd/doa82Hr7ucYHOxn9zcUamrPkrwZF EP57zAVtBFUi4kldGCPSyQ02okZMBNmVzq4DpYKF4NsnMeKG54HjtQ1QEc+16BBd+hEa Wy4Q== X-Gm-Message-State: AOJu0YxD2G5TZLOJrC+q78Paxk1coKxtxyBMZUkYPNk1okW7MN7sr2k1 1132ENJAfTbsno6wGcl1cWk= X-Received: by 2002:a17:906:714a:b0:9b2:b9ad:ddd1 with SMTP id z10-20020a170906714a00b009b2b9adddd1mr4885066ejj.28.1696509430566; Thu, 05 Oct 2023 05:37:10 -0700 (PDT) Received: from localhost (fwdproxy-cln-007.fbsv.net. [2a03:2880:31ff:7::face:b00c]) by smtp.gmail.com with ESMTPSA id gq7-20020a170906e24700b00993664a9987sm1131147ejb.103.2023.10.05.05.37.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 05:37:10 -0700 (PDT) From: Breno Leitao To: jlbec@evilplan.org, kuba@kernel.org, davem@davemloft.net, pabeni@redhat.com, Eric Dumazet Cc: hch@lst.de, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, horms@kernel.org Subject: [PATCH net-next v2 1/3] netconsole: Initialize configfs_item for default targets Date: Thu, 5 Oct 2023 05:36:34 -0700 Message-Id: <20231005123637.2685334-2-leitao@debian.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231005123637.2685334-1-leitao@debian.org> References: <20231005123637.2685334-1-leitao@debian.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=no 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]); Thu, 05 Oct 2023 07:36:11 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778926606495284008 X-GMAIL-MSGID: 1778926606495284008 For netconsole targets allocated during the boot time (passing netconsole=... argument), netconsole_target->item is not initialized. That is not a problem because it is not used inside configfs. An upcoming patch will be using it, thus, initialize the targets with the name 'cmdline' plus a counter starting from 0. This name will match entries in the configfs later. Suggested-by: Joel Becker Signed-off-by: Breno Leitao --- drivers/net/netconsole.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index 3111e1648592..7c46cf1c923e 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -53,6 +53,8 @@ static bool oops_only = false; module_param(oops_only, bool, 0600); MODULE_PARM_DESC(oops_only, "Only log oops messages"); +#define NETCONSOLE_PARAM_TARGET_NAME "cmdline" + #ifndef MODULE static int __init option_setup(char *opt) { @@ -108,6 +110,8 @@ struct netconsole_target { struct netpoll np; }; +static void populate_configfs_item(struct netconsole_target *nt, + int cmdline_count); #ifdef CONFIG_NETCONSOLE_DYNAMIC static struct configfs_subsystem netconsole_subsys; @@ -165,6 +169,10 @@ static void netconsole_target_put(struct netconsole_target *nt) { } +static void populate_configfs_item(struct netconsole_target *nt, + int cmdline_count) +{ +} #endif /* CONFIG_NETCONSOLE_DYNAMIC */ /* Allocate and initialize with defaults. @@ -193,7 +201,8 @@ static struct netconsole_target *alloc_and_init(void) } /* Allocate new target (from boot/module param) and setup netpoll for it */ -static struct netconsole_target *alloc_param_target(char *target_config) +static struct netconsole_target *alloc_param_target(char *target_config, + int cmdline_count) { struct netconsole_target *nt; int err; @@ -228,6 +237,7 @@ static struct netconsole_target *alloc_param_target(char *target_config) if (err) goto fail; + populate_configfs_item(nt, cmdline_count); nt->enabled = true; return nt; @@ -740,6 +750,17 @@ static struct configfs_subsystem netconsole_subsys = { }, }; +static void populate_configfs_item(struct netconsole_target *nt, + int cmdline_count) +{ + char target_name[16]; + + snprintf(target_name, sizeof(target_name), "%s%d", + NETCONSOLE_PARAM_TARGET_NAME, cmdline_count); + config_item_init_type_name(&nt->item, target_name, + &netconsole_target_type); +} + #endif /* CONFIG_NETCONSOLE_DYNAMIC */ /* Handle network interface device notifications */ @@ -954,6 +975,7 @@ static int __init init_netconsole(void) { int err; struct netconsole_target *nt, *tmp; + unsigned int count = 0; bool extended = false; unsigned long flags; char *target_config; @@ -961,7 +983,7 @@ static int __init init_netconsole(void) if (strnlen(input, MAX_PARAM_LENGTH)) { while ((target_config = strsep(&input, ";"))) { - nt = alloc_param_target(target_config); + nt = alloc_param_target(target_config, count); if (IS_ERR(nt)) { err = PTR_ERR(nt); goto fail; @@ -977,6 +999,7 @@ static int __init init_netconsole(void) spin_lock_irqsave(&target_list_lock, flags); list_add(&nt->list, &target_list); spin_unlock_irqrestore(&target_list_lock, flags); + count++; } } From patchwork Thu Oct 5 12:36:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 148712 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2016:b0:403:3b70:6f57 with SMTP id fe22csp324007vqb; Thu, 5 Oct 2023 07:09:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHqlsqdOa3V1mPxSjcCz3wxVoMAZBeto0zH5HIbm0sC7MXPVqHEqwh/x1eo2ZQH+Wt0O9Tl X-Received: by 2002:a05:6830:219:b0:6c0:a98f:56e0 with SMTP id em25-20020a056830021900b006c0a98f56e0mr5129157otb.38.1696514977358; Thu, 05 Oct 2023 07:09:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696514977; cv=none; d=google.com; s=arc-20160816; b=J2Go6VJoBRe34fqQKd5jgkJ/a4npJfwimZshUCoe0MD+6Cm0/SpFBAbLDxmJVkI2aV mk25xHKCYNZvwVLalI0J088ohCzgBygPSPsR8wVrbcnO3tMbesXd+1P6p7krbGF3bf1v 0tHtlJsnF5NVja90Sj3Qq9Vfxf+cGXw2L6VIyuH/vI10OCVoeCqBMpybh/SFu7W1Kbo+ a+wgZs84+y7fdrU6DO2Xn6KrIT4Egkjwzuaj0LPYwEA6ZwV9MhLBf6cv1kNgx3QFw0A4 ldvwzEG7EylTNaZwdjPK2kKu3YGPf6dTCl32w+KhvZIW70d+abPH3uDbxlwVDf7JCxfN vnWQ== 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:from; bh=F6QrB9RE51dC06x5LjgJq6wybwojSHDaqDVY2rSdCIs=; fh=t3kfgQuaGyM84gKNjjnNISmg23a5dmENm6EBz3YSRHQ=; b=PPZboYypRNSXQgde1XspNH8m1/wD4TMAbTgEO1/rmPO7MDi+w2abbd1iGipbKORHjx z26/w3gTT1bsCWZrYnO5xUurHCq7z+K6jrQFitCh90YP6TqG4GR/XKmcNWKodkfHAFrH 0RMVP0jzA+kYXCIEguyGO0afDTjPhMiEU6AoT2phZ9CC5ogqRkvR70BMMVEB8bJ8AZPk F5QVuciVuNA5lUF5W1bOF4QGcZV2bLqSYICPhHIjfXiFQSppE3SPhvYYxBjW4CAlW8Zu JX67OTcmnZTGe4Svu1UVFeIDb9Fvuc3dU4lasXIxIVdygzHXYVCsstr62eCq19uD2e+m hbfw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id u11-20020a6540cb000000b0056532a14f54si1029947pgp.900.2023.10.05.07.09.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 07:09:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 6F423801CBEC; Thu, 5 Oct 2023 07:09:36 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232895AbjJEOJW (ORCPT + 19 others); Thu, 5 Oct 2023 10:09:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231664AbjJEOHL (ORCPT ); Thu, 5 Oct 2023 10:07:11 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E6C826A51; Thu, 5 Oct 2023 05:37:16 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-9adb9fa7200so215884166b.0; Thu, 05 Oct 2023 05:37:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696509432; x=1697114232; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F6QrB9RE51dC06x5LjgJq6wybwojSHDaqDVY2rSdCIs=; b=iGxfy14qA05uTpqb9YJkv7Vxr0ty/W16zgd+iVXaK7toGF8Yv3a07AOpEe/cYV01Sq uBkElF1Q/FIYD6wd6vW1R8Nz7OevBPokb8R6cK644Vtba1JjFtAzRAtsEah9c6mrH93B iTcS1w+sbWFtygL6oJjeRA/FqOPalXGnUEJi1G8aRlQQhSD3di07z0+YcpYKO8VfByrD VDP3irpOaOybuhXQrfnm4/teKgzeb/RlQtbAwkJJng+P9s9BLduUtILQsxScD9fqAAS/ ZszPhf6e0z5JRpdoPq6WchI0138caR+XWvib6MvIfF+PsG7jC/p0eF/jqpy+9W3ALIQw w3/Q== X-Gm-Message-State: AOJu0Ywu1Ts0/9VnVu0q2fl8xqlm+lGwngddYAxSkjjTghnKiwk8AvAo Vb8EOyo3k8GhHVNjfL3SBiQ= X-Received: by 2002:a17:907:3f9a:b0:9ae:6648:9b53 with SMTP id hr26-20020a1709073f9a00b009ae66489b53mr1175352ejc.23.1696509431770; Thu, 05 Oct 2023 05:37:11 -0700 (PDT) Received: from localhost (fwdproxy-cln-001.fbsv.net. [2a03:2880:31ff:1::face:b00c]) by smtp.gmail.com with ESMTPSA id op13-20020a170906bced00b009a13fdc139fsm1129726ejb.183.2023.10.05.05.37.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 05:37:11 -0700 (PDT) From: Breno Leitao To: jlbec@evilplan.org, kuba@kernel.org, davem@davemloft.net, pabeni@redhat.com, Eric Dumazet Cc: hch@lst.de, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, horms@kernel.org Subject: [PATCH net-next v2 2/3] netconsole: Attach cmdline target to dynamic target Date: Thu, 5 Oct 2023 05:36:35 -0700 Message-Id: <20231005123637.2685334-3-leitao@debian.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231005123637.2685334-1-leitao@debian.org> References: <20231005123637.2685334-1-leitao@debian.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=no 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 (snail.vger.email [0.0.0.0]); Thu, 05 Oct 2023 07:09:36 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778924889331624231 X-GMAIL-MSGID: 1778924889331624231 Enable the attachment of a dynamic target to the target created during boot time. The boot-time targets are named as "cmdline\d", where "\d" is a number starting at 0. If the user creates a dynamic target named "cmdline0", it will attach to the first target created at boot time (as defined in the `netconsole=...` command line argument). `cmdline1` will attach to the second target and so forth. If there is no netconsole target created at boot time, then, the target name could be reused. Relevant design discussion: https://lore.kernel.org/all/ZRWRal5bW93px4km@gmail.com/ Suggested-by: Joel Becker Signed-off-by: Breno Leitao --- drivers/net/netconsole.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index 7c46cf1c923e..4aa40e2e4c86 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -685,6 +685,23 @@ static const struct config_item_type netconsole_target_type = { .ct_owner = THIS_MODULE, }; +static struct netconsole_target *find_cmdline_target(const char *name) +{ + struct netconsole_target *nt, *ret = NULL; + unsigned long flags; + + spin_lock_irqsave(&target_list_lock, flags); + list_for_each_entry(nt, &target_list, list) { + if (!strcmp(nt->item.ci_name, name)) { + ret = nt; + break; + } + } + spin_unlock_irqrestore(&target_list_lock, flags); + + return ret; +} + /* * Group operations and type for netconsole_subsys. */ @@ -695,6 +712,17 @@ static struct config_item *make_netconsole_target(struct config_group *group, struct netconsole_target *nt; unsigned long flags; + /* Checking if a target by this name was created at boot time. If so, + * attach a configfs entry to that target. This enables dynamic + * control. + */ + if (!strncmp(name, NETCONSOLE_PARAM_TARGET_NAME, + strlen(NETCONSOLE_PARAM_TARGET_NAME))) { + nt = find_cmdline_target(name); + if (nt) + return &nt->item; + } + nt = alloc_and_init(); if (!nt) return ERR_PTR(-ENOMEM);