From patchwork Fri Mar 14 17:58:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 14017300 Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) (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 B42F7126BF1; Fri, 14 Mar 2025 17:59:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741975196; cv=none; b=SqPHHTLH+psGxCVpuhfNMoeXeokko0qkEs713y4jZ5uydzEYeiYf2Kgc9Z6DEPwQEuN7WNOePcGXPmfck9LfN9i9z8/BN1LFNvH0OJuwEyiu+ybt4EtlWWsflhW3Ok5y1alRZ9HKk5gqAA4eBjoflOSPtBO0Z9XKiFbQWJdCXzA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741975196; c=relaxed/simple; bh=Db0Gx21LeDEy3UpaKxfP9j+CMkh1Tq77tExJhiQYujE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VlhaaP1Aqa1H1BCkyxY8Rj5CnQik/uSrmULaBBuojVbd5sZRzpDA/jqpCV5q9X9AEKIPJj10aithUI1RRT+pWgUw+0H5aEB2oeP2DvD6txil11J2qRXW3c06depRAWxAxKEPAuWiUUle4opnQcsWuNVsHVTFtIvkXGmKJ7jArzk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-ab771575040so662332166b.1; Fri, 14 Mar 2025 10:59:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741975190; x=1742579990; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=joWV6bv3JsBp0mclWJfyzmk3Od6B8+HfkBZEbmYgnxs=; b=fPS2NSL3zLaScpNc/opKqI9V2u6YPrNaWeX266P/mdEncEkfpX0kikvz0p5dwHu484 nKH8EXmEpLuNqMcfp5UCWDg5G2weCQuZZycDwmWto6rGGe98J4wOeFcxQl/FplbBD7BE 7RkG2rEPIVoHVQoiRyh0fqfuM5NeCH/4646qFDDhsJigQAAybUi/MepkNRStgRu6Au8V 33xkmQiC0NFg0GKFgbecoENH5HRqhGGd0QFA/NcqOguV2/n2VRm966236PXY8S9Y0lXB buDRr+0ZSpzeq442PbRWbogyp//fq7WcBkPs6SMZiiRn609Ew6R77r2dyfyQA3OH4LrX /zvA== X-Forwarded-Encrypted: i=1; AJvYcCU2QnctPcbA1/k1WKmPzhUk9n1cGz5GLd3lPGGuvhAOgYCJ4mEU4K6pOJoRSKc679kiYqNOVxzl40U=@vger.kernel.org, AJvYcCVX5qyGVePVfRtWlixAoVxBywniJv8jHRQoOieOQa9i1b/U+NukDyyjb9JV5/1dCbiu3vyZc1AoJyOHb6Pox/t7@vger.kernel.org, AJvYcCWvUenEpPdwAZ0Rfw4q4QCyDqcpHL/7m/GFLk9ldC2vu+5XNfHEBlVOzPb/XhRHQOfJK4fyi9IF8P7H0zFC@vger.kernel.org X-Gm-Message-State: AOJu0YwulbtRQPPICM9219LgjNR/r9t/18II0Ynz/XKO7/X2rLw7/bhA E2mqSfiQBKWrrc8ay/+Rf7wU5W7Tx7uS844GEMF7g7RSuzgu7bZayX5S1g== X-Gm-Gg: ASbGncve0Z0QhXxAiLfDIOBkjhRR4DdjdrxNpqPMH9GkWo6U5rAwUGXIWdop90f4+Bq bBUs6Sl9mo3zOfwiKPcT90h+UOug+6oMhZ4YEJErAZp0VSEAYyLKdJCMIfTVrNvR0Y6hV4JuVv5 hsRrj7AvEeM1Pch6hGE117yqNwMcE9fzMEGgPD2diWqZm0sCqGAykCt6PoMjPxYA104hnjmGsGP QOJuquljJwXucjC7G6U/DqOz87XqHRnDCDx/cfbcO4T+TDFGRZO6+4YX+ryV9AyGkHivrDDQB/4 tHA7Eq0YxR9E1czDMyn13vtoZdFGa+nlzatUSzRLQdNHIJA= X-Google-Smtp-Source: AGHT+IHoPmp4ZpsZnjgUVsVf5SPue0DANz6Ks8bjlrlru21uoTOCW0JqlMMBGdGXtQ/rk34hRPTtpQ== X-Received: by 2002:a17:906:6a0b:b0:ac3:45b8:3f51 with SMTP id a640c23a62f3a-ac345b8412emr51346866b.16.1741975190300; Fri, 14 Mar 2025 10:59:50 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:73::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac314a495d6sm250949966b.153.2025.03.14.10.59.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:59:49 -0700 (PDT) From: Breno Leitao Date: Fri, 14 Mar 2025 10:58:45 -0700 Subject: [PATCH net-next 1/6] netconsole: introduce 'release' as a new sysdata field Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250314-netcons_release-v1-1-07979c4b86af@debian.org> References: <20250314-netcons_release-v1-0-07979c4b86af@debian.org> In-Reply-To: <20250314-netcons_release-v1-0-07979c4b86af@debian.org> To: Breno Leitao , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Simon Horman , Jonathan Corbet Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, Manu Bretelle , kernel-team@meta.com X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=1058; i=leitao@debian.org; h=from:subject:message-id; bh=Db0Gx21LeDEy3UpaKxfP9j+CMkh1Tq77tExJhiQYujE=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn1G6SnJtTZewiqRjM8o6FFXxkEiAsMEBgev9p8 kt1WSLhEnaJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ9RukgAKCRA1o5Of/Hh3 bX2nEACPAS/Zr6WA8HdvjIEw3qq5QU4KDVTIN1rNjK2mbbHOzpxfjz8A5+LI99CgOzFtJdDwCg/ DiZ8JVWUtwOrXsJHLyK1T9Z1KNnUo9LyoVu+9HqBQ1LWla+JsSVEgqtHd0D46p3kCbqff1abmOV NDM7lzgYyO+kFV22AygVHKVHnroDYqobrog6j+615e7qZUaOpZiL3MjLKhNbhahJJ4vcy5Gs+uc A4w7FNdsWBJmqUccrjnsBaHHD18Div0rdXsTXDrqZ/+jepxB9Uw8SE9FBn7/da12QHn+KmCr/p8 a0+sHTzwvbkPBq2QglywmO86CL4hhDmRVMom/eARnBmwqiwiZuJZbK74ItIMkdqW3alyv3XGHuD GQ2iWD1TNuHJy6Q69bbE/k3eDnlxn1YkclmZ9XMO0/NEJkFDzMfYemZLqJ5UOTtWBLdpZOlwOAV Cg77CfcRFia/97jVKdLLXNZCfbaiXmsG0eqCcataqcHijDgEX+oifndqX5mpTxj7MxZeWXePE3l /6+0b8FNDby5ecIgSPAc3t8Eleiv7c79wx2MJDO+uTh8zA7upEUImB00xgV3tZgfdaulfyUK8sG tIUOUqBn6UybGDk4BLAejIFdneEvX+xb1VKh45nkM9WJJRI3t0XbJeqX9/YBSqbE8Nyk1tpExHi BgYDPH2XU64hzVg== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D This commit adds a new feature to the sysdata structure, allowing the kernel release/version to be appended as part of sysdata. Additionally, it updates the logic to count this new field as a used entry when enabled. Signed-off-by: Breno Leitao --- drivers/net/netconsole.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index 098ea9eb02373..b7f7ec39e8318 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -106,6 +106,8 @@ enum sysdata_feature { SYSDATA_CPU_NR = BIT(0), /* Populate the task name (as in current->comm) in sysdata */ SYSDATA_TASKNAME = BIT(1), + /* Kernel release/version as part of sysdata */ + SYSDATA_RELEASE = BIT(2), }; /** @@ -719,6 +721,8 @@ static size_t count_extradata_entries(struct netconsole_target *nt) entries += 1; if (nt->sysdata_fields & SYSDATA_TASKNAME) entries += 1; + if (nt->sysdata_fields & SYSDATA_RELEASE) + entries += 1; return entries; } From patchwork Fri Mar 14 17:58:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 14017301 Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) (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 6474F204C0B; Fri, 14 Mar 2025 17:59:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741975196; cv=none; b=KcFCEK5b0Dov3qtX2dLNaVBihpuUgQM4zGGyBy5kWebfq6f5nTkruVGLu+biAg3mIqZ7r9/7iaGX4qREXw58S64LjLdn5Mos9lsTHgQKumOZh0IyQTYNDAHVMRdifzgLT/7dCast45msFoWomAl/8zXxiJrUTt9Uzcpj0neteek= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741975196; c=relaxed/simple; bh=BaRRFyndeptPtTPlgfrAgt/14X5vfYem7RCE0fqktCU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Efb2gqt+lFIdF391BROZtyHcx/p2qzQQBkrqGaZnzVTBbHq/HyjdkIU6xgQHTrxPwPPbkrJa08VGGelwg3IXC6Tgy3iZCsmnjxSpTP6Wr6CzkzvOVXKYsXtJLmBV0EoBlEz8ZR5XtQgvvvLZLyKrAfukHw24kJidu48kDpkOvW0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-ac298c8fa50so449604766b.1; Fri, 14 Mar 2025 10:59:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741975192; x=1742579992; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=moWrd5k5XQTiMZmqhtTkeH+6sN2JizEsqHKfD51m9W4=; b=qVmzywFjfJ1TczJuJ1NI/g1dGwsQli6Jmh7llVc3TRY9aiPOyHN/fnerBUjuOksZ6k Pc6z+2BvnrH3h+45ql5UcJXV4Dwm7HBEQaqcemBvOrImrqCIclhFZvtjHyWlnAa5TL/Y +9Qjbg89AvLqyilgeEVMDE6kvz/AIWtzxejDQNKtMK+/zWFoED3hi7Y6Z2mXq9Eujzba xX/9Z5ARUnFkej6s7w2qvH62WmUhTNrZe+pxAvQ7hbku0REP9kLd8q4kfn+up+eZWNrs OUWE29mt/y7EkeJAmJWBzr1GR11+zWOpN2ynpDfy3sGVXJTyetSLbNjqTp2LKLzdOrAn Fpyg== X-Forwarded-Encrypted: i=1; AJvYcCUWkY0+SOw/FSWY9/cwDfwdNJBqCpKcP/MoFpQ6NLvnPx49NDqQsSs2GypeUr9p8wZDPAi4bSIbY31sfAug@vger.kernel.org, AJvYcCW3XHRcry5cwHSJsMeWYjHCmL/3gUYv/8x2oOc+YT4omlk21RITiRD3C1YcY0QYEkEV7Y9o3Qr7sag=@vger.kernel.org, AJvYcCWpyGy+s//0npPbEvntXMTxsUKTL7+zOITBU/ToaQ4nlzsx++hKZT1XlVg8Pxplv/vSDq27nIysPndvvg/hna41@vger.kernel.org X-Gm-Message-State: AOJu0YyTXm2x5FokO5mb8kncaUobkjiVDYE0XXKnkP7aCwbPlElbZwos V8XBk7swi/PnwVQMAC/AVWPAdVO/UazjHLPbIuXWuLwN/JsNZ+DhR99cFQ== X-Gm-Gg: ASbGncsdbIpvu9kUbZv7wV7sxf1mEKGrHSPCLcrkKTbDGccA74YZoQ4chAvBk7H9Jad SFYGk88Bce04g+KXfDkqrKMvROFjnPGVE46qgP4PD73ZQbnEjdCWsQrogulPNkwhm2GR14uQmwg 62NtgH18jB79w8atryJoB8a/ffIoEVUSZxkzBZKGtoPuhDjHXhryxca2anCevmUthK+0UXggpMe +vKv5wcfMqzl0EdnSJli5ct+IFLSzxF+P9fAmAWiW/LQ5UrKNgPGoLB6ntD42jjk6/14olNRFZx DkpfMaaBmFy14MbeOMNR0/ZKUpjb0YWbUVrsUJpqjEjyT4g= X-Google-Smtp-Source: AGHT+IEy1iUaNdyPU2+u1d8/0s8YFDtw8qkyJWL7jfwKAHjzyXus72/8V+9TXaelNbq2rdjEHSal4Q== X-Received: by 2002:a17:907:3f9f:b0:ab7:6606:a8b9 with SMTP id a640c23a62f3a-ac3303f75c6mr362665166b.42.1741975191945; Fri, 14 Mar 2025 10:59:51 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:72::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac3147f0ecdsm251523566b.73.2025.03.14.10.59.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:59:51 -0700 (PDT) From: Breno Leitao Date: Fri, 14 Mar 2025 10:58:46 -0700 Subject: [PATCH net-next 2/6] netconsole: implement configfs for release_enabled Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250314-netcons_release-v1-2-07979c4b86af@debian.org> References: <20250314-netcons_release-v1-0-07979c4b86af@debian.org> In-Reply-To: <20250314-netcons_release-v1-0-07979c4b86af@debian.org> To: Breno Leitao , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Simon Horman , Jonathan Corbet Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, Manu Bretelle , kernel-team@meta.com X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=2976; i=leitao@debian.org; h=from:subject:message-id; bh=BaRRFyndeptPtTPlgfrAgt/14X5vfYem7RCE0fqktCU=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn1G6SB38mfCpawekGM/luEB202uVSYezLeWvtz ucN/DDQWcCJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ9RukgAKCRA1o5Of/Hh3 bQcnD/43SbPWrk5WRJ8KWO1JiJzp97lFDT3FA9lF3KGZPydZku4IUw8600ih/glXhAkdJw1ga5/ RodH6Oa4ykT+gP9/GyFnpOBh5uorsz+UyGEnkcjOp9UniIb4+Z+Be7RyDgbVvS7XjGOTKBBV3vC 3yQl6K6o2D1qUjl1fApakAvVKZZPD6/ucI6FTQysU+Vf/6cLm6xnG/xA4iEXYK1ulcc93RVMB28 uJIpxcmdk3YPn/Tuff3GTL6c8tmHQTQ9FABQCPpYZRp+0X3Hnp9YQlaLhQiu2xUb8NmbugHfz5l yThWNltIJWjIkJXXMXRJDrxKPVAr7cSyIxw7pyA7H10r00znqFvUr46GcmAU0WREkvJ3L3V4CPg 5gGd9CxP+bXIsTlakH5iGW5jXHCNuWfJAcU0nIhJllinCQMxrZIKfvIHkA9WNvlMicuqGrjRaCq j3gaoR77Ort/c8qSoqNKKddN8cjVNdEV13l1QclBJMfvT9Zwzr3088FOus1V814sE77yucUR7Zd Gs2o+OTXl7F0aB64yh7uPJdX5YnvIKn7JzyqUV/62hsbXvfEXY2Kw0slCf3WO3ZXUrhCnnPIAAT IX3jvtMSHuqJ7yqlWZL6TpNJPAHXas/CHf+yn/EO81fz/B3de0S1cbHjDXhbXbAocY+Wf/+a5pZ QPq++noflJuwjWg== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Implement the configfs helpers to show and set release_enabled configfs directories under userdata. When enabled, set the feature bit in netconsole_target->sysdata_fields. Signed-off-by: Breno Leitao --- drivers/net/netconsole.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index b7f7ec39e8318..0914d29b48d8e 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -442,6 +442,19 @@ static ssize_t sysdata_taskname_enabled_show(struct config_item *item, return sysfs_emit(buf, "%d\n", taskname_enabled); } +static ssize_t sysdata_release_enabled_show(struct config_item *item, + char *buf) +{ + struct netconsole_target *nt = to_target(item->ci_parent); + bool release_enabled; + + mutex_lock(&dynamic_netconsole_mutex); + release_enabled = !!(nt->sysdata_fields & SYSDATA_TASKNAME); + mutex_unlock(&dynamic_netconsole_mutex); + + return sysfs_emit(buf, "%d\n", release_enabled); +} + /* * This one is special -- targets created through the configfs interface * are not enabled (and the corresponding netpoll activated) by default. @@ -859,6 +872,40 @@ static void disable_sysdata_feature(struct netconsole_target *nt, nt->extradata_complete[nt->userdata_length] = 0; } +static ssize_t sysdata_release_enabled_store(struct config_item *item, + const char *buf, size_t count) +{ + struct netconsole_target *nt = to_target(item->ci_parent); + bool release_enabled, curr; + ssize_t ret; + + ret = kstrtobool(buf, &release_enabled); + if (ret) + return ret; + + mutex_lock(&dynamic_netconsole_mutex); + curr = !!(nt->sysdata_fields & SYSDATA_RELEASE); + if (release_enabled == curr) + goto unlock_ok; + + if (release_enabled && + count_extradata_entries(nt) >= MAX_EXTRADATA_ITEMS) { + ret = -ENOSPC; + goto unlock; + } + + if (release_enabled) + nt->sysdata_fields |= SYSDATA_RELEASE; + else + disable_sysdata_feature(nt, SYSDATA_RELEASE); + +unlock_ok: + ret = strnlen(buf, count); +unlock: + mutex_unlock(&dynamic_netconsole_mutex); + return ret; +} + static ssize_t sysdata_taskname_enabled_store(struct config_item *item, const char *buf, size_t count) { @@ -939,6 +986,7 @@ static ssize_t sysdata_cpu_nr_enabled_store(struct config_item *item, CONFIGFS_ATTR(userdatum_, value); CONFIGFS_ATTR(sysdata_, cpu_nr_enabled); CONFIGFS_ATTR(sysdata_, taskname_enabled); +CONFIGFS_ATTR(sysdata_, release_enabled); static struct configfs_attribute *userdatum_attrs[] = { &userdatum_attr_value, @@ -1000,6 +1048,7 @@ static void userdatum_drop(struct config_group *group, struct config_item *item) static struct configfs_attribute *userdata_attrs[] = { &sysdata_attr_cpu_nr_enabled, &sysdata_attr_taskname_enabled, + &sysdata_attr_release_enabled, NULL, }; From patchwork Fri Mar 14 17:58:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 14017302 Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (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 BF9FC204F87; Fri, 14 Mar 2025 17:59:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741975198; cv=none; b=irqiQKmgLS01ROeGm+Y7Ba0zq1YLrf89FsUS7GF0YuMXasmzo4XVfgAA1nXKhYjMghQ/rUF0ABYRbVVY/ZH+jEwSNvHVf8HiG+hjjqCMJPtCU8UESFTwzG7qZCi57wB3FfVfe1iIJl0BJxvi+D1yReT+i36/Y2mjCxoWRGyYAdY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741975198; c=relaxed/simple; bh=9zoK/o370Hp+GIGyXyaCMaBTt0r5VttvjyFVwdbqryA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SErH3VzyJMLyMA2RsYRT4tpBYSB+WRBLBSwRYdx0mYeW0vOeIFv1l1EP0nxNDh9iWcsN96Fk9fxqECA4oQwuUaYnXHOAUPjyvYXUTjvZpmhJzDP/ts52iKQxxTNvPrE/6qt7YtxyFaekw9SOlE6cB9EZLQBqGROFYSHGhefIzyc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-abec8b750ebso412951166b.0; Fri, 14 Mar 2025 10:59:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741975194; x=1742579994; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=U0wf74SckaVD+jh859Co9o05rMdYp58DCNm8f+EmDjg=; b=JOpBd8885i5mkfrz5WqlVnnTf43tyo//KegFgLLxKnw0gAlLSf4cdNbGa4Qh2NkHwN n14KrtZheXWCbEDtbl+agSQckwNSj0Tg1E7sMPd7aswjYAyfhYardAsxF5H3bPTwBM4c reNTpuqzD2HoOkdOslUtS/XSBIRa68GC6Q0FwVyJedmMCnal7xcAarxppTfcPRjzexrQ d+4KGW5l9TQAc8uVzMQpRmm7NFDoPck0RpByRR/pmegsq7nWNnsZMo5GsPnn8ggfqxgl lGk9NaZcKR9susLXnWUgjhTQOqXwqzPA2ocOYz9J/koiQgIAVwH4/MCgSd3YK619+pTD s+xA== X-Forwarded-Encrypted: i=1; AJvYcCUEKLLoIx0Bzjc6hx1hCCwkJCy1mB6NAQIpkRfwz2gCMzzdaawxuLTQTWpFSKb8nhZ2azIrEOSGjGIGMQ50@vger.kernel.org, AJvYcCUjWXt2RXFi93vajwdeVw3CQ2w9eZNniL16M/96VLuXwiBqV8ITv3Tr0bT/ad2PeVysx4sbV03dqcdhDmDultyK@vger.kernel.org, AJvYcCXHoxN61BVoVCwc3X4oIMWen6PmIIOdWZZPw4qLX7IpkK/byhCculSNtDi2JkQpR6UwqIAJQAPIkgE=@vger.kernel.org X-Gm-Message-State: AOJu0YztF9Nu+6uskQalsEAqtClBkYqoZjqMS/DKt04WMreywW4gmwRK cYY8hy/vsrBNl0NrWyWWHgW8oi1IWyYXbj45T8NSe+VrTiFPuJ2nbmP0Kg== X-Gm-Gg: ASbGncssELqsYgfqFpdEkNqJ1foWCg+Rfxw8WLRuR5f19SxicNkAkMrtF/2tyXH71YW j/MU9n+4zU4brIkjm+THyg6Qb59bxGLs7TpyUN9tNmA7fMoDIxeGxCDYymTt90D1SHIfJXwJu4d 4KPHiEsg3SUIHKGXg2e5kMlOND5iLhBs4ybd96cS1BVCRHMrS7fLYeqR8OfoMwHxKknr7i9q6NC sG4uD1YOQZDwspzJvls8SItQUzqYLFr6Ix3X85/0KxmCA3wHGh7OBcJbAlfGWU5hWRuBzMyHDJJ 9e+LclL6tL9tZnfuC6qOVQxYBSoa2dWu///9 X-Google-Smtp-Source: AGHT+IGyemGpvQfthPAyO2rLzUepkGTVknVu1bf1FV/uW02p3ujQAyHxT0pAeQScTy7QQEKjIgz2Aw== X-Received: by 2002:a17:907:2d91:b0:ac2:d6d1:fe65 with SMTP id a640c23a62f3a-ac3303bb742mr433366366b.41.1741975194269; Fri, 14 Mar 2025 10:59:54 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:71::]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5e816ad3914sm2198493a12.64.2025.03.14.10.59.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:59:53 -0700 (PDT) From: Breno Leitao Date: Fri, 14 Mar 2025 10:58:47 -0700 Subject: [PATCH net-next 3/6] netconsole: add 'sysdata' suffix to related functions Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250314-netcons_release-v1-3-07979c4b86af@debian.org> References: <20250314-netcons_release-v1-0-07979c4b86af@debian.org> In-Reply-To: <20250314-netcons_release-v1-0-07979c4b86af@debian.org> To: Breno Leitao , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Simon Horman , Jonathan Corbet Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, Manu Bretelle , kernel-team@meta.com X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=1950; i=leitao@debian.org; h=from:subject:message-id; bh=9zoK/o370Hp+GIGyXyaCMaBTt0r5VttvjyFVwdbqryA=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn1G6SxJ+fcN5J9iL6YVottqwgkSAmc4BmBTwl8 nrAwnJWc0+JAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ9RukgAKCRA1o5Of/Hh3 bWj+D/4y08QBG/ROOmdhJUzYgOPl0kCLyWOtcKYPcnqFZNthHEcuaJp4nWe/e48JzoK3lwKVME/ g7hfPNBN5HfzTJTLMeqDRYoO/1kha3XVGVw9AUGkcfeZcpyXoA16qvbXrcBTnCx9neHKsUZhAps DRH72nvZVKk1Kc9mDBaFAxtmJ71JQ/o9nkJJEuX5kVooVW4aOhs27XLWxA1uPebJzfIPpve61ND XmKVI4GciKtkID3orwShg45e6JNBXI3HaokB4sJMFpdW7fJp7tl9uMi9Ro0bMmZEoZnDX7UjNLX 4fON4Qoeq8EF0FjaMyhejrFk2iQrlBYoc9GoBiEq2a2kYHeGVtc2MPEcG4cq1Pk9nakX9y+2Sgt NFER5IzBb0DZd9KgDtOkS3IFVjDjw/L4JMJ0nxLtfqNJU2gBXrvYcy9jX5rxPI4QH/3EEDJQtv0 detYfWiExyn4pGS5mrXFOJkujqUJFG+C5aCayApi+PQjCBIzddBK67BMP1z+qNRm4y60n05D8gI TGFAs0YBa31Ow6lhPflXrkeoFSst/Dd8pLY7vwmwycFRWOIiRQHDwG1x4rwe6S2Aw5QsHtnYRKq UGRXbRorE+x5PwqDbZhXRrrDWb+4s72hT1b7+4DW3+qZN7tH2Eb+29aaFgfr0w0ZrGDg/M+PeIP tPVCGhPLnzFwDfg== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D This commit appends a common "sysdata" suffix to functions responsible for appending data to sysdata. This change enhances code clarity and prevents naming conflicts with other "append" functions, particularly in anticipation of the upcoming inclusion of the `release` field in the next patch. Signed-off-by: Breno Leitao --- drivers/net/netconsole.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index 0914d29b48d8e..970dfc3ac9d41 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -1224,7 +1224,7 @@ static void populate_configfs_item(struct netconsole_target *nt, init_target_config_group(nt, target_name); } -static int append_cpu_nr(struct netconsole_target *nt, int offset) +static int sysdata_append_cpu_nr(struct netconsole_target *nt, int offset) { /* Append cpu=%d at extradata_complete after userdata str */ return scnprintf(&nt->extradata_complete[offset], @@ -1232,7 +1232,7 @@ static int append_cpu_nr(struct netconsole_target *nt, int offset) raw_smp_processor_id()); } -static int append_taskname(struct netconsole_target *nt, int offset) +static int sysdata_append_taskname(struct netconsole_target *nt, int offset) { return scnprintf(&nt->extradata_complete[offset], MAX_EXTRADATA_ENTRY_LEN, " taskname=%s\n", @@ -1256,9 +1256,9 @@ static int prepare_extradata(struct netconsole_target *nt) goto out; if (nt->sysdata_fields & SYSDATA_CPU_NR) - extradata_len += append_cpu_nr(nt, extradata_len); + extradata_len += sysdata_append_cpu_nr(nt, extradata_len); if (nt->sysdata_fields & SYSDATA_TASKNAME) - extradata_len += append_taskname(nt, extradata_len); + extradata_len += sysdata_append_taskname(nt, extradata_len); WARN_ON_ONCE(extradata_len > MAX_EXTRADATA_ENTRY_LEN * MAX_EXTRADATA_ITEMS); From patchwork Fri Mar 14 17:58:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 14017303 Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) (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 7693B204C3D; Fri, 14 Mar 2025 17:59:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741975200; cv=none; b=cHExpar5jnQIWwU65oMP+mmJRsYnKNXEkcGiB6irWigcEzI1bqV+XVke1WiBOxwUcBpYU+WGt/ip+Eghv9k496iR1qJwpdUYBxPZeUcg7+zsEz0hYINFXZRDOKbhjJBmhOEjSvukeu95BJsob0PIgGpb3BTlNiXzDaTL6AcdaWQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741975200; c=relaxed/simple; bh=n7YLmPKcFzyiMGY19sL42wzgcPH5DaDlDb9GzN0V1Do=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cCEat1or/pQtF7FKcl3HfPcAvretqtvjnZmraJTA/9+5hNFfRnwXS0abg9tU0fyXoc9w2TJfOirSGZXlEueOa/Zn2DgUpxGtorscsl24TpqUzDrhzBiJaGV0BqfvXqyUanH8sfoQYyyAtrcy6JnC6YzAJpyzmv0I4jUHdFiTQ9g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-ac2a81e41e3so517039266b.1; Fri, 14 Mar 2025 10:59:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741975196; x=1742579996; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LRuwy9RwiCwKukzO7yJkusNhn22YXKV9KVdTGuMVhAI=; b=aLZtUcL53G4p1yhiSXsBk25i/k/6a8c/x29XxzR8wAigXoN4ODXmul6Y3xraHiTVbR SkY9Eu51qgJZWKFt4ZTVpmxxNKG2qfNNFZvhPRlUnbcAz1TTgjcHP7hE2exlJa35H12d gXyMef3efh31K3XH3dB85llkRBkesld3YS33seOMhDhwOTj9a3WzjHNi3E+zmnTET3uX qJpJvvEfvQLDjX2mOCGQN187ut0G3QjGBfCOPQ0NdqfeJLAje9gHEhw0dkwy6R5lwu6e rr02wf6GhOq9qlVpWoIz0wzBznUhSNambtbYZwk8EsX7EDg23EZ6zzCxSdRXsvd7bKqS ki4Q== X-Forwarded-Encrypted: i=1; AJvYcCVRcSgEYW4ERKhbM0LsAiZTtqU2+DJgCAm2IDe+N6tdR65YPncC0fgcnhSHpf4ZHvqXWkDcW3mmRUXgeftT0fpX@vger.kernel.org, AJvYcCW3R1Iles7JDqwnTY9bHrLAWwTQBdBxPsYYwIoWJgk/hY7owhmvHptgeJEfa2SlC5vev/5qBSJfk2xLFzRU@vger.kernel.org, AJvYcCXgvPvdY+itIadQBO7AnsVbO7YYchH3lBjPyNF6aOagUQoVwaGQmjwcs0xzjGtHZ72cJm+C//R5F98=@vger.kernel.org X-Gm-Message-State: AOJu0YwYE/+Y09yXcLpwb3iWk1UdBJounfG9NOSE0EmQpQQGPUcgEITY pkVMrEPO4d2gTRr0oHauMW0QSEhdmYvvHSz8Z3xPROo0r4tlVlCF+sLUXA== X-Gm-Gg: ASbGncuTLALA1TogDKZBQ4fqvXzde2nUzCePTWuagsCS6EQKCImppTDhVB0p2hKiRkp hIaJAhBQw1/2QXKzuc0gis8JyBiqB+WjCB0ILKSaa1/piCRvevJbd2B9lxmYZoW8sJT9E6DQluF LSq7S5Rxvk2H+oEEgCH09G3Qj8RO6+NEvREvaNBdsGFiHnXK4/yd8EJ01aPlggjykphGMLzvUIz XUGjIGBVpa6triPm9iu4+s5+DX52cqxDlGJUKjg8MwoDoKfzFpkNQTrzdHW0mwSEwpEh2zsvimb MTZrKkQ+qNVMDy0nepd6xMV8Z3NI7C5+2yP8 X-Google-Smtp-Source: AGHT+IHYtsX/skL+dGTCOLuiJxtx25JKkIFbmzmpjCz6CWGM6K/cB109Za+T4m8txU4x9C/Y4qDKqg== X-Received: by 2002:a17:907:2ce1:b0:ac3:17bb:34fc with SMTP id a640c23a62f3a-ac33041cc4fmr372928466b.52.1741975195881; Fri, 14 Mar 2025 10:59:55 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:74::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac3146aeb2fsm258576766b.15.2025.03.14.10.59.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:59:55 -0700 (PDT) From: Breno Leitao Date: Fri, 14 Mar 2025 10:58:48 -0700 Subject: [PATCH net-next 4/6] netconsole: append release to sysdata Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250314-netcons_release-v1-4-07979c4b86af@debian.org> References: <20250314-netcons_release-v1-0-07979c4b86af@debian.org> In-Reply-To: <20250314-netcons_release-v1-0-07979c4b86af@debian.org> To: Breno Leitao , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Simon Horman , Jonathan Corbet Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, Manu Bretelle , kernel-team@meta.com X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=1406; i=leitao@debian.org; h=from:subject:message-id; bh=n7YLmPKcFzyiMGY19sL42wzgcPH5DaDlDb9GzN0V1Do=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn1G6SeKx5oHF1VFRCXelhWesax/zFygsmYGBtT H8hy31AlUeJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ9RukgAKCRA1o5Of/Hh3 bcdGD/9800VJ0IWU0Cq1DMcT7UBEm3XKtpuzBk1da8eN5GD5rzePLkzyEcWK6tRwo+auNbLnvQs WqSnnd2QGnUOePRgdmKNTxwwfBDC9NhtOyxy1KAXqACbMhcSQpvnvLiePLA2cnMIPWx6VJfPHPr YywLQcv5GMDOcNSffgGR9OSdDe0Z8v3wkXLtEQcJ/hd1NMML8k8EYHDw5rnMGH33456CfSAYOGf 3FkKiNqBNpAGh1NyIxH9N6HcxoPQE6VvK5srN7iU6V3ntoy3ivEQGFyHiorNBSszCVmwWSzm2u7 ObO8c5C8Tu+Cj8tVjQcJ8cl/HdS4e3eicgXBjo0Q+cPw0XLMnF729wbrYmKk3FQwP3ugLGRgYYG cA2Ir+K5J0AgXeZaL8yxe6jgdqVCo/kO1KCqnwDcFpBXdWQyD1zWZ+7AdrCo0W6p13Y1No/0+y1 EblqldE7dJgFoyFIPmUlAeg5KQWS7hdlp2Z6/Uu6ZEGDmQ/3SxZesln/7hzCKmsVjIwkS+LHErV 3t1evjYSUFRGJ0udFfsMJWulsWjMd5r5cbBLtD+fI1GLMC4rNkV0IfZPNRZmbHiIfRX+E9PyFxe sV/pL3GIMrmIRnPEsh9h6oo67Ht5wDTAH/ZGJYKb2gygK0f7Wn27Wb9qc/EeJ8ZzGB6y4w+mDfu SWUdFNL1cig7kHQ== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Append the init_utsname()->release to sysdata buffer before sending the message in case the feature is set. Signed-off-by: Breno Leitao --- drivers/net/netconsole.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index 970dfc3ac9d41..0a7981ef752c7 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -1238,6 +1238,14 @@ static int sysdata_append_taskname(struct netconsole_target *nt, int offset) MAX_EXTRADATA_ENTRY_LEN, " taskname=%s\n", current->comm); } + +static int sysdata_append_release(struct netconsole_target *nt, int offset) +{ + return scnprintf(&nt->extradata_complete[offset], + MAX_EXTRADATA_ENTRY_LEN, " release=%s\n", + init_utsname()->release); +} + /* * prepare_extradata - append sysdata at extradata_complete in runtime * @nt: target to send message to @@ -1259,6 +1267,8 @@ static int prepare_extradata(struct netconsole_target *nt) extradata_len += sysdata_append_cpu_nr(nt, extradata_len); if (nt->sysdata_fields & SYSDATA_TASKNAME) extradata_len += sysdata_append_taskname(nt, extradata_len); + if (nt->sysdata_fields & SYSDATA_RELEASE) + extradata_len += sysdata_append_release(nt, extradata_len); WARN_ON_ONCE(extradata_len > MAX_EXTRADATA_ENTRY_LEN * MAX_EXTRADATA_ITEMS); From patchwork Fri Mar 14 17:58:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 14017304 Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) (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 BDD7F205ABC; Fri, 14 Mar 2025 17:59:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741975201; cv=none; b=O8ur3vc2cWKYcP5dNjSBdJrKYvV8GXBmvmHCs9Pe3fq19igVQ8IpU9RqKS/xE/AodnRgY+txIbeZgXFPzRZIVGciHCxIIFDF5Y3irTazQ9RYrvKiuCO3zWXoLuPhNcFbWNzbSSjOt4bQXP28XYsfv8YcBxqUxL4axpvRwiKzXhM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741975201; c=relaxed/simple; bh=UipaB9hoJ9sM5A99ex+560BlTWBVYtNKkcy/qL7TVJQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=akC/DxqXG6JqtRVg70UL423fRtozs25FBBASTvDjfC/B3pRMdKULxSGZIarSaJi5lh9VbTilwwvVsc3fTlp/UgMFNxlh2WnzwVU5bwTxVHFcJpdNJn2Q3jLV5EsnImgEVTwJ7dwu0C3dt4eaKRNF1lOmhieZ12oOIfrWk1hCJzA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-abbb12bea54so475998666b.0; Fri, 14 Mar 2025 10:59:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741975197; x=1742579997; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9zi5Ya6zVuc3o3JT7UrajdwgOkm0Us2iQ/oS82X6tSs=; b=WWRl8CqkD4TnH8wEhxGRF63yMk2RvNCu4Je0k8Vf4z71fhZM5sHS1KTmP1oZqBUNoY ds1Evt3rJEEZnt3Pc+KLcydJhiaZT+tXDzy0YOKLFfy9Jm+Vq+vTNDTroJ98oJJPMS9l o63gZu0ndXdbmdOt0KnCeLNE9jBGljzRFtbZ/2rJIfB34QZzX15dz0eElQNUOYz4RCDd 0DYYUlNJhwdckzBs9lzx1JGd2x/eJzU7mJ056/nPg+EkQFRGeyqnajOMJo7epK4LEGlh hewhW+39F0o9GODC24bRaWzWxtPuuhodhUrEkXv80DsV+4RW3bdmztlrbob0k4zIaPUo FKaQ== X-Forwarded-Encrypted: i=1; AJvYcCV5ajmA9/5v+0Te84YQ8OpX+y3KE41qNKF9xLzpcT+2eZ42lhf66293ndZzUp1prXtGRBelPEOfVqjmPYsQ@vger.kernel.org, AJvYcCVE3fF7Sb73VDv8cQGkg9l8kVrOfs5Dx1+KfJqPbodbKDBpWNX3U5TwA2yCNxQbd23Y5kAvX2ln9rzG7tE8E8wD@vger.kernel.org, AJvYcCXsmbtbHtXf+pt9FXg0IS5Iu8cEfWtq8ywdGqrl3Kz++7ctWrIh6eWBR5VsnWYerVZ9/4iAq9R5Rw4=@vger.kernel.org X-Gm-Message-State: AOJu0Yw/lICnUVUdzeT5F08A2TadS4NguUWqfv1J7y6/NYMsNIJtZO9p oKtVrfIzAopelglIXeo8USIhiS4pu4zZZxUdvnl+z44isWfoPxLVXRgldw== X-Gm-Gg: ASbGncvr2ux104ed5eQXkazJk7lIrmLA37xXAzDxXssEUQgJb8epOpEK2aAWvRzs4Ns gtypPHkWB3tGEX6HCnE5S0STL8waoYhLD9aGzj4BMzicwkzlq2Vo+SZyuerb9kRfeOYFWH4iRtq RnXPYxHWs/XFpxoc1EGllXJZ/iinDq9IqiYgmQc6gdkGnYhkekhuDsBSQmd5THxXyzpaWtX/iAZ gIEY/gthZpJv/ejzSjwzyXFR+OeoB59cbk/FwyFhgR1/zgjwsrACNasX8yFNW6ENHSzcEAOHXbK z66Z3SegZSZ9sFDAB9WmT4fq7nYh7oWn1oM= X-Google-Smtp-Source: AGHT+IFYSwyoRIkMY8R28iuiFyPTQOKqMHeVIyMj0cmy6Hyucv9clb9+g1mLe8JmnRF5H66i57J7rg== X-Received: by 2002:a17:907:7d87:b0:ac1:e00c:a564 with SMTP id a640c23a62f3a-ac330397ccamr448558666b.38.1741975197448; Fri, 14 Mar 2025 10:59:57 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:1::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac314a3f651sm250088166b.125.2025.03.14.10.59.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:59:56 -0700 (PDT) From: Breno Leitao Date: Fri, 14 Mar 2025 10:58:49 -0700 Subject: [PATCH net-next 5/6] selftests: netconsole: Add tests for 'release' feature in sysdata Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250314-netcons_release-v1-5-07979c4b86af@debian.org> References: <20250314-netcons_release-v1-0-07979c4b86af@debian.org> In-Reply-To: <20250314-netcons_release-v1-0-07979c4b86af@debian.org> To: Breno Leitao , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Simon Horman , Jonathan Corbet Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, Manu Bretelle , kernel-team@meta.com X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=3535; i=leitao@debian.org; h=from:subject:message-id; bh=UipaB9hoJ9sM5A99ex+560BlTWBVYtNKkcy/qL7TVJQ=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn1G6S7hj423DEaSGHFSTeENNKhsWXvfeG0Ito/ dBrtKGBbMiJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ9RukgAKCRA1o5Of/Hh3 bWTRD/0Sg5iDHe7VIi3WRYRp1CQEXxh/362toOluMWjUh/0YgXcHjK6QqirqlrPgxs4beYKbVyH HsONNBbeIN9BXHLstNP5PzrIWAlihgDVhyAmOvt5fGkyXd6rnhWPzSs4AWRTf7Ct6q9kUpulgA9 jkejcFCkzqumIuIAHFp/IGX7DGo3SqQa/X/xYL+g2Zo/nwPWIBV/9TaZvjxMYFPsKkuPt2NVubC 3F+qvTziB/GkHT7UT3W4zb/0ngadRJRc0R6X9JL7zCR4Wa5qrixiuR3q3FB3n0FBq/3DqcXLWBB peEl/Cr/iPou3ep8mEoqcWveuVabbUtKExNzUUZeVmLLw2wClyVQPAPf1P7TaG7JbTkamljZJvR e4gnXE3jOVl3p+doDYfa7qvbw77096BI3ekn9kyvOeTRaPvie7xzIuNm7org37+lyQV3p7Sw/Sv 7HjeU0rzJ15iX8Mbxed7mgDFA3b96Dni/EkHiAGgpk5Ghi80Aqv3kXULCd3wYDJfubGoYJ9hZAs W4HEXIG10+3kuRImewiIbSN2lYx+du+EEEgM8ykQPkL1ZmCjkGy0zrxLzcavwR3cW6MpYKjv+VW w6DAVIIIjE/+bJCyl1zT2Ky+yOrYJlKV0wYVZuvsGUDw+BXFKXHO9vakOwLWHjB5T1Bc+F7FfIJ comUpbUr1lTYJwg== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Expands the self-tests to include the 'release' feature in sysdata. Verifies that enabling the 'release' feature appends the correct data and ensures that disabling it functions as expected. When enabled, the message should have an item similar to in the userdata: `release=$(uname -r)` Signed-off-by: Breno Leitao --- .../selftests/drivers/net/netcons_sysdata.sh | 44 ++++++++++++++++++++-- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/drivers/net/netcons_sysdata.sh b/tools/testing/selftests/drivers/net/netcons_sysdata.sh index f351206ed1bda..a737e377bf085 100755 --- a/tools/testing/selftests/drivers/net/netcons_sysdata.sh +++ b/tools/testing/selftests/drivers/net/netcons_sysdata.sh @@ -42,6 +42,17 @@ function set_taskname() { echo 1 > "${NETCONS_PATH}/userdata/taskname_enabled" } +# Enable the release to be appended to sysdata +function set_release() { + if [[ ! -f "${NETCONS_PATH}/userdata/release_enabled" ]] + then + echo "Not able to enable release sysdata append. Configfs not available in ${NETCONS_PATH}/userdata/release_enabled" >&2 + exit "${ksft_skip}" + fi + + echo 1 > "${NETCONS_PATH}/userdata/release_enabled" +} + # Disable the sysdata cpu_nr feature function unset_cpu_nr() { echo 0 > "${NETCONS_PATH}/userdata/cpu_nr_enabled" @@ -52,6 +63,10 @@ function unset_taskname() { echo 0 > "${NETCONS_PATH}/userdata/taskname_enabled" } +function unset_release() { + echo 0 > "${NETCONS_PATH}/userdata/release_enabled" +} + # Test if MSG contains sysdata function validate_sysdata() { # OUTPUT_FILE will contain something like: @@ -93,6 +108,21 @@ function validate_sysdata() { pkill_socat } +function validate_release() { + RELEASE=$(uname -r) + + if [ ! -f "$OUTPUT_FILE" ]; then + echo "FAIL: File was not generated." >&2 + exit "${ksft_fail}" + fi + + if ! grep -q "release=${RELEASE}" "${OUTPUT_FILE}"; then + echo "FAIL: 'release=${RELEASE}' not found in ${OUTPUT_FILE}" >&2 + cat "${OUTPUT_FILE}" >&2 + exit "${ksft_fail}" + fi +} + # Test if MSG content exists in OUTPUT_FILE but no `cpu=` and `taskname=` # strings function validate_no_sysdata() { @@ -119,6 +149,12 @@ function validate_no_sysdata() { exit "${ksft_fail}" fi + if grep -q "release=" "${OUTPUT_FILE}"; then + echo "FAIL: 'release= found in ${OUTPUT_FILE}" >&2 + cat "${OUTPUT_FILE}" >&2 + exit "${ksft_fail}" + fi + rm "${OUTPUT_FILE}" } @@ -169,9 +205,11 @@ MSG="Test #1 from CPU${CPU}" set_cpu_nr # Enable taskname to be appended to sysdata set_taskname +set_release runtest # Make sure the message was received in the dst part # and exit +validate_release validate_sysdata #==================================================== @@ -184,19 +222,19 @@ OUTPUT_FILE="/tmp/${TARGET}_2" MSG="Test #2 from CPU${CPU}" set_user_data runtest +validate_release validate_sysdata # =================================================== # TEST #3 -# Unset cpu_nr, so, no CPU should be appended. -# userdata is still set +# Unset all sysdata, fail if any userdata is set # =================================================== CPU=$((RANDOM % $(nproc))) OUTPUT_FILE="/tmp/${TARGET}_3" MSG="Test #3 from CPU${CPU}" -# Enable the auto population of cpu_nr unset_cpu_nr unset_taskname +unset_release runtest # At this time, cpu= shouldn't be present in the msg validate_no_sysdata From patchwork Fri Mar 14 17:58:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 14017305 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) (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 5AF99205E18; Fri, 14 Mar 2025 18:00:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741975203; cv=none; b=f+R4Y5pCVFVbM4cCeb8aux8NUqbwTsZgOliQFiuvXaco9WzIuAaqtld8tlxlqj5AK6TLe4PFwLCCGPWmjm59fvDhKPGSwilAcwkWL2Q3jQ4ZVf1lju7ZewMbOpN5olZIER1W3lE7HLoivFaWHuqztRp3TeOZbqIbU+jsCFD8ANE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741975203; c=relaxed/simple; bh=u2j/NzYgk/d8iGdvU8IUJdzQd6mljcLDKSOYxuEqFMQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iSz5sPCEZXyITB9fyx0oBFsqBZ0WuzhWLrN6NTYvjGMZnfwRy3mHm5jvZz3mlnzZOUYI2DSS9ah7cAvyDU62YP49ZEXsD9PKVciPutLJ9o25ZFdMFW15MqoQYFBnNGb2ymWNUxIHUKTBLk19LSUng779y9HT1vCd/q1Ck2YocLE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-ac2ab99e16eso494234866b.0; Fri, 14 Mar 2025 11:00:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741975199; x=1742579999; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SaIvKW2mgl+3uA9xHER8fMViH0sfgfYeNYyYR2PLWqM=; b=mP0j/3TRmUaYxxzSi+ZMjKP9Y5uSaR6+HBX1BKqBaKu8MjZiA1vhL7Xek18qjggsW1 md/h3gkXJarAt6QGh0sUr/v3wN8mUt7oA9/yNmd49O8Lm6UfD68UXDW99hIEpcydGn3x tG+n+2xKA4yisB8ZANcTaHo88uPwsoD2zv63cMTM8pEqAQfjL3YslY+bfO/THPJZn7M0 5Pw7LvuG+XFFXSv24393ENzlnkiw2bqZ5HnZYDhtAwelFYAG9ulyUu4KIS6NZ9368Nfi rJeL9O5pbZp3v4J5qwtXK9BFwI7s+22U6aepe3WXqRI6VuFGJW7B7em5V2jYjpsDXn8q PQpw== X-Forwarded-Encrypted: i=1; AJvYcCVFqt+Iu0JFDbLcx5IoqvapcivfL6kTSG2M6cIsz+D8DJ3xfU2r6TUL+KvxTfIpbW/tsK85AUZC4uU/y0bW@vger.kernel.org, AJvYcCW4mo4RNLzRKMbDApvBg7La6MKQ48p2mFqj+NL7SwBk+6t0q6QohU+Qv8ChVVsPmHSLFNwfJhH+ou5pz47QOpSX@vger.kernel.org, AJvYcCXFt72VAcAjxUWjXwAD6mjb6LPIyWYoh5Sfrq+9plI21EsvbGa6RZhfPFJ8/RTddHoxfS9+3kgHV1Y=@vger.kernel.org X-Gm-Message-State: AOJu0YyVo3q1StCfeeX6MnFGy2vwzT6MsrpUIo0Xquzeli6B8Kgcq7K5 Uq7xL8kzAQles4qb5791JIpKO0lsq9dzrXzNciWmcR0nwpvpvm2hDYsU0w== X-Gm-Gg: ASbGncsSjXhwu4PDV61w7nuUdCRJKRfiD6cnhYgjhTZMqneJRrVGyfI3HjkWbSwaM7U BoLhd8I6qZuzaiKLRdZUpVbQ3Qx1hhe5rlj8JfJkI2qcvOVTDX2Ol3Y+Uyk3/jPPOZVv5yixBC0 a//23BXPTL6o6de5lxt8ghcGES/YrPz6xC2YfzTExVjxXcyDR7jBnT9HNJ/DVX7xlBO9CG2AFda ONP45fltYvLPHjIOBsHvOWD/WYUvxQPZ0t5CppnO0a0uC+q1bMiuMyVXXEQ/I/OjCc1aMYGwpPS X1ZI7XuNBR+J+ZdqZ3nsJnfEoQCRbNs9ZNvf X-Google-Smtp-Source: AGHT+IE0gCLI1dRzN42ISOI3SznEjuPXbPl3ACCM4prwxY9/ZX0Qybd90r7TKQJmjA7QcpcfBxn4pQ== X-Received: by 2002:a17:907:7251:b0:ac1:ecb5:7207 with SMTP id a640c23a62f3a-ac330301e93mr384393666b.29.1741975198992; Fri, 14 Mar 2025 10:59:58 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:70::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac3147ed1e4sm256125466b.66.2025.03.14.10.59.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:59:58 -0700 (PDT) From: Breno Leitao Date: Fri, 14 Mar 2025 10:58:50 -0700 Subject: [PATCH net-next 6/6] docs: netconsole: document release feature Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250314-netcons_release-v1-6-07979c4b86af@debian.org> References: <20250314-netcons_release-v1-0-07979c4b86af@debian.org> In-Reply-To: <20250314-netcons_release-v1-0-07979c4b86af@debian.org> To: Breno Leitao , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Simon Horman , Jonathan Corbet Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, Manu Bretelle , kernel-team@meta.com X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=1790; i=leitao@debian.org; h=from:subject:message-id; bh=u2j/NzYgk/d8iGdvU8IUJdzQd6mljcLDKSOYxuEqFMQ=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn1G6SLMwdJ4gjJcxr3mdipOopPqrC5GAx1bakl REwxlOE9++JAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ9RukgAKCRA1o5Of/Hh3 bSynEACdkIq8fJbzIuspTFutUJ7ZzO2CzJ1GgNRqCJwjfwjDyF6Wt4MkCQ8s2s1XbO2z7GshqLA cmnyIL9lGnkGZOavKJtKUCLbo+tCCnQDm3Qo+JbFG1ObICAzvus+AVfE1285o5JtO8DvK94UVVN 7I1lBzTVeS4hupscEEKDFA4AfrfvIwzlYYcKi6EPdz6qRU75eyzXxla09izAYIYCV5I35C+R2FC aXW/RNsxBDVY40h3T3MbZcuar9v7HDCUiAZZp3aUSlR7th4P7Ry3kvHVnV5TvfHJD8Og1Xs7pKT L6Nc4AbbVxTNshwUbmU+l6ofNaEXH7YzbWbpCjGf+SlZD3wN8KnGSUQe5APmU2kfDdsPQ0NaCKq XBuVl5eS6lrxYA7UAZyBLx/NkvxFlM/Qzk+8+jVAGc0UPMr6IysS8bARuHFT/mcr3pUQVcnRiMs QDlB5dnAO+Kam2PJZR3h9lHeXHcVeN+4nIoHiQQsg/3ifmQ0k95rzt9Nxi64zNwlzE8fSrTfpsy 92a6zZAwNAvObtitWqsmPS1SaRT8VsoYFe1wZq6iK88nipeCk17lwxA/naVEXcP3O013R2yUrvL xQH4xeZasjPD8xDQORNMWz83IhQfsPlDqpK0mBDTYntiUzRT9hVkVnzyZqgzEiULI8bDVVzNSUD vkqIMhd+GlV/+4Q== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Add documentation explaining the kernel release auto-population feature in netconsole. This feature appends kernel version information to the userdata dictionary in every message sent when enabled via the `release_enabled` file in the configfs hierarchy. Signed-off-by: Breno Leitao --- Documentation/networking/netconsole.rst | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/Documentation/networking/netconsole.rst b/Documentation/networking/netconsole.rst index ae82a6337a8d8..44f5a441cf813 100644 --- a/Documentation/networking/netconsole.rst +++ b/Documentation/networking/netconsole.rst @@ -268,6 +268,31 @@ Example:: In this example, the message was generated while "echo" was the current scheduled process. +Kernel release auto population in userdata +------------------------------------------ + +Within the netconsole configfs hierarchy, there is a file named `release_enabled` +located in the `userdata` directory. This file controls the kernel release +(version) auto-population feature, which appends the kernel release information +to userdata dictionary in every message sent. + +To enable the release auto-population:: + + echo 1 > /sys/kernel/config/netconsole/target1/userdata/release_enabled + +Example:: + + echo "This is a message" > /dev/kmsg + 12,607,22085407756,-;This is a message + release=6.14.0-rc6-01219-g3c027fbd941d + +.. note:: + + This feature provides the same data as the "release prepend" feature. + However, in this case, the release information is appended to the userdata + dictionary rather than being included in the message header. + + CPU number auto population in userdata --------------------------------------