From patchwork Mon Oct 2 15:53:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 147359 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1529299vqb; Mon, 2 Oct 2023 09:08:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG2eDmhbmJiuOAZLT/KVUeWd52ZouKtEp4CoeHLa5FZ8K8ZR4vEaZF/zPZbE+5Gk/nzMWQq X-Received: by 2002:a17:902:ec90:b0:1c7:27a1:a9e5 with SMTP id x16-20020a170902ec9000b001c727a1a9e5mr10859plg.33.1696262889867; Mon, 02 Oct 2023 09:08:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696262889; cv=none; d=google.com; s=arc-20160816; b=M/xPKUqMEPItZU/dpAidSUd5qKxPSJe+gQPaNleV58Bhhexp/Ry+d6DakE6P1idSGC /OdZ78iLVuGPYtXQM+1XuwAO/3k5kMun9CujVKQiGwp9YcHnARVvxDPYT2o9wzQ4dsSU Z9R2wWP21QugNR+q6yY0n1dLI3SaTpSaH4bCZOdUIjtuORe5nrGb4FrdppaealIBvySG eLfkAT5aTYj+Xu/FTGZqD09LnMtG7r2hPFFefgN2ZnWltZ+LvLaq+soGndyI/vIIWlSd XfdjhsYvn8B5IZMmft2vrvf+7WJZnryjT6987SSGKC3rOvP66HHRl+L+BFpuWXq33Ly3 8bKA== 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=+dB3Fa+xaQmqZtxLPNwQ8zqx2W86fDzE1tsm/B4ppuQ=; fh=t3kfgQuaGyM84gKNjjnNISmg23a5dmENm6EBz3YSRHQ=; b=ZUtfRQdbFA0Fq3omrv4oskjNLh+1t1hov7y/uUqc1MsJkoyzsr3Xldz6p3T0Z+NrnF fPtOFoIv2rlPkA2RiEtCYhqIGy6jFf1kN/qxQKI0VuuX5gH+WijrbY7ht76pb75KnCMw 5dkqe0iRiGTOj9lrQzdymJ3oK8NPq9ucP6ojNVUw/RTK1BMxrKgdSfhxydPEeN5gz8Uu aQvqD7ZDhYuiQzdt7p/WnpXyMvN6tE4+63Cf0PLoCFl/12dksMjhOndPhyI/cPuT5i8j JcoiNEanFRUM1SL5IwC4cm7tl2kFt2C2c2O9ajvzsBk/+9yHA6aGdWhjGktBxRwf1v99 IFbg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id d10-20020a170903230a00b001b662f49f60si30100089plh.419.2023.10.02.09.08.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 09:08:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 294BB80ACB59; Mon, 2 Oct 2023 08:56:02 -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 S238295AbjJBPzq (ORCPT + 18 others); Mon, 2 Oct 2023 11:55:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238278AbjJBPzo (ORCPT ); Mon, 2 Oct 2023 11:55:44 -0400 Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C632AC; Mon, 2 Oct 2023 08:55:41 -0700 (PDT) Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-503397ee920so25279412e87.1; Mon, 02 Oct 2023 08:55:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696262139; x=1696866939; 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=+dB3Fa+xaQmqZtxLPNwQ8zqx2W86fDzE1tsm/B4ppuQ=; b=TMMU2FvuLFxPwXEBCAUEi4NO8oNlWEuf/KT84R/bTb0NZRsd0fQc1Cn8JEiC+MDOXk 26vP6NszPkHj8AmKvNvQwXxzTnkcQu4qWyTzngmQYr+/e+3zTydWGN14eafR2TTVKhd2 urRMZnAryCRVnQOcsb0buopkXtLhKX+vy7fMPs0smNLAg3Gu3tyV+by0NZQybnGzpy1l Yxb0rwMjdUHMOssS/utD7+QApRXkeIjqRH3rH6/y6NxlWpWbszpplb3JmN5HupkKczir wVc5djKfhI5fTTHO9Aqy6FnegT8zudAtaLzVzr+HH9VqzMG9wc4Oc40gPLPuPH+Dk6zF HwUw== X-Gm-Message-State: AOJu0Yx5XzC7swe86e5BI6dQuF4GssllWkAjF+AnC0O/XCn8yzD24xa1 T+7XKTNYBTK08moZdHJ3gHY= X-Received: by 2002:ac2:57c6:0:b0:505:70dd:d594 with SMTP id k6-20020ac257c6000000b0050570ddd594mr5844378lfo.49.1696262139348; Mon, 02 Oct 2023 08:55:39 -0700 (PDT) Received: from localhost (fwdproxy-cln-017.fbsv.net. [2a03:2880:31ff:11::face:b00c]) by smtp.gmail.com with ESMTPSA id j5-20020aa7c405000000b00537708be5c6sm5419783edq.73.2023.10.02.08.55.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 08:55:39 -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 1/3] netconsole: Initialize configfs_item for default targets Date: Mon, 2 Oct 2023 08:53:47 -0700 Message-Id: <20231002155349.2032826-2-leitao@debian.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231002155349.2032826-1-leitao@debian.org> References: <20231002155349.2032826-1-leitao@debian.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=ham 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]); Mon, 02 Oct 2023 08:56:02 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778660555631538961 X-GMAIL-MSGID: 1778660555631538961 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..b68456054a0c 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 DEFAULT_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", + DEFAULT_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 Mon Oct 2 15:53:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 147367 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1541124vqb; Mon, 2 Oct 2023 09:26:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGYlU2eiHHXXdgmAZG7jl3+wEt/0xLFriPgCV56AtZPdn6CXjvpXXL8upNa+BnfBdg+SoKw X-Received: by 2002:a4a:bc96:0:b0:578:c2af:45b5 with SMTP id m22-20020a4abc96000000b00578c2af45b5mr10575922oop.0.1696263990431; Mon, 02 Oct 2023 09:26:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696263990; cv=none; d=google.com; s=arc-20160816; b=JCofuDEd7KztTnx5X8OtZhYSFozwMy2M91So8d1mXnXNw6fxKlFNbCnR/uIie0cKK6 0Kv+N95Ie37aQeH6rl+7eHCuY94clvVOgBiSNfy7gUVRHk1F/HP5NIH8khkRGy9N06rn vJudTF6TnGRD2ZU7LicUoV5pCTfofM3u6r7xz3W9lHfyg/K9ivmEHoMLWoaWR8U2CzZq EPRz52LG7vJbbktWbKgQAfSwEHfkkjZsJG2b6oc9DtIaLT9Bn4M9b5Dm3ittlgjo4TiX WxqLeQ+3qsCY/aJNMrH+IvnmFzEPXs9+Y4Uj9ViNHNRu41FoLRKrByD4zXtpj5Htrfnw ESBw== 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=aVA8+4Ag1gceWiVP2I9j+CrDamJhnQG/Ib4pWtjPquA=; fh=t3kfgQuaGyM84gKNjjnNISmg23a5dmENm6EBz3YSRHQ=; b=ZkBfyYJu6qS9wa5JIAOYJzNziySFRcQu0AbirgIoKcnCG9Gg0Pn6RzBWx4FiAv2qeb rp5K/dc0gAz4p4OJNepWbiPKZ3SreuwxYEHD8+DyrMgGW2BbyjRgdarKGkTqWUn3l9Vu tD4qm7jFqp/0NEl3Tsexfb05qmwFYjPGSB+iIKhYaG7tddSFQaQbLLVPnxjV4wYLGWsL a7O2RLgD2yJTsV/HCZQsrVodJJkT9Ij1MO8ujJCZrEbPnpqctjAnxuFN9G/Pa/yRWnIC bucAuOvERUUINiLZ+yKdE8SgdxYsjpi8mTaB25FjqM5M/qRdBlr+su9Mbl531+JQDwKh 69ew== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id d3-20020a633603000000b00579ab302fd2si21627139pga.814.2023.10.02.09.26.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 09:26:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id E8A128076154; Mon, 2 Oct 2023 08:56:29 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238330AbjJBPz4 (ORCPT + 18 others); Mon, 2 Oct 2023 11:55:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238245AbjJBPzy (ORCPT ); Mon, 2 Oct 2023 11:55:54 -0400 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B70ECE; Mon, 2 Oct 2023 08:55:42 -0700 (PDT) Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-9a9d82d73f9so2279293066b.3; Mon, 02 Oct 2023 08:55:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696262140; x=1696866940; 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=aVA8+4Ag1gceWiVP2I9j+CrDamJhnQG/Ib4pWtjPquA=; b=NC3X17Hm6TbXzEoKpGMKlllx3HIwjaxuQKC+K+dogwBAaai9lXPlwKBnmWsmhdraiV h8NYlt6mVUSur7fGhnrhr/JFVwnhZaWR7P9TArLlHJv0TZvCgGBAgsasvtAsOJTzZWES uCImysrwRnQTgQofMKrZ+y2lIYhGNEoO44EJPbL9wM+Nt0tDbemfKbxUIGYbxCQ2jnv7 1LeMlbk9B+GxyRJiEOPdUstOAYTmAHWOyizpT0TAIFZ0NJV6x6ufXGzW1B4shLGeUiN7 KsF40LUXGiPg09bnTQL0Q5U/idE13OSPf0mKGvwNNutrnvgbDNDFNTnprJq2vDli5Run wZXg== X-Gm-Message-State: AOJu0Yw8sbpLrzRhN9oZfvYx8izhR9WNxvEhK+H/9ne2dVTQ6XTbT2po KAo1riAex6O0x4zYIGfVhZU= X-Received: by 2002:a17:906:3019:b0:9b2:73b3:29a1 with SMTP id 25-20020a170906301900b009b273b329a1mr11631013ejz.23.1696262140597; Mon, 02 Oct 2023 08:55:40 -0700 (PDT) Received: from localhost (fwdproxy-cln-118.fbsv.net. [2a03:2880:31ff:76::face:b00c]) by smtp.gmail.com with ESMTPSA id t20-20020a170906949400b0099bd5d28dc4sm17289237ejx.195.2023.10.02.08.55.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 08:55:40 -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 2/3] netconsole: Attach cmdline target to dynamic target Date: Mon, 2 Oct 2023 08:53:48 -0700 Message-Id: <20231002155349.2032826-3-leitao@debian.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231002155349.2032826-1-leitao@debian.org> References: <20231002155349.2032826-1-leitao@debian.org> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email 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 (pete.vger.email [0.0.0.0]); Mon, 02 Oct 2023 08:56:30 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778661710095200971 X-GMAIL-MSGID: 1778661710095200971 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 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index b68456054a0c..6235f56dc652 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,13 @@ static struct config_item *make_netconsole_target(struct config_group *group, struct netconsole_target *nt; unsigned long flags; + /* Checking if there is a target created populated at boot time */ + if (!strncmp(name, DEFAULT_TARGET_NAME, strlen(DEFAULT_TARGET_NAME))) { + nt = find_cmdline_target(name); + if (nt) + return &nt->item; + } + nt = alloc_and_init(); if (!nt) return ERR_PTR(-ENOMEM);