From nobody Tue Dec 2 02:19:49 2025 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (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 88FA018C008 for ; Thu, 20 Nov 2025 00:15:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763597732; cv=none; b=kQlUIMqKxfido9f+0N6ZtSsCyD7QAAC+8J/hWUqQYYcvkyfDjPDhXVruUYiBMQjeWsdFdtNqyiqM3L1pRu2+lEdFmp7Pz6RSTVvY1Mx1mmWIBlwba8NpLDmBbuAuaCRYYY3NMgoleO4V5rLKwFF+IeaWfJhDeKp/C1GCbGGyFKg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763597732; c=relaxed/simple; bh=A+e/nVOlaZ56zvXJcIRkAIZ5Y05NwOtvPotrfRVwvj0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mECTVDqfv9MHoZ5TvsKEUiIrC2TxHC/0IekYwtwxZJnpjniepyUSkZimMJEmZVsQ0nTKm4Dm6fcYd7U672wCrYRH67+MkQ1iusAdOran9bG/liLY8ds/FDYGrqT1Brvth/zbZpFtdqVVFzSd4xSSlxZ0Ny2oJbkQTOYupJb7gHI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=klOomM+Y; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="klOomM+Y" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-4779fd615a3so432635e9.0 for ; Wed, 19 Nov 2025 16:15:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763597729; x=1764202529; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=oSV3Qno4VTxKne3uQqV5TvNBdPmZLOl9DM1bseCRnBU=; b=klOomM+YhwoFXlyRjwFhEtCnCCSyft5LEprNremKGx+NoiZct6A2Ly7HO5ssSKX+ht 6pnmX0zEG0Fi6eFcJs+YsQa0IjVzDWo2jXTNRi4UkyQ0FKMrAG4gdAddtEWD36miAMlI nusStjVXLBbJo0jUkzQ9jSS7syWPEpGdeIyvYuJQaDTQOnIFNE6hg45fT47ILPXFKo4H joOU4DQfHSIwhgdxKoibF+sq6bhttEg4T1rdsQV3pEUVQ32VLJs5fLb2jPSpQFSIiMWe SypfXEATVvkn0a2zypM5b4TLPwZRvlQBQ6tVzOcVCqnCKiUeGJnTcfUhf0wEdVa0BRda Nwwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763597729; x=1764202529; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=oSV3Qno4VTxKne3uQqV5TvNBdPmZLOl9DM1bseCRnBU=; b=YyooquqOt1DiObAUwigGAQ1scBViOlEJfVUJmBqApjhBGpDgEdt2ajZ5C3hmu0pORP vU4JXxHzCrXaVWM78OZ6Cn/Dm0CbVtCM/Y1Y/2bPtGy//QGiKeWBybNwGSzlHST7I37O cNAOkg7WSH/2cTMqFQGwCTe+Kc7V9c+vZ2Pd7YC/8Zp4S/GH8d8l0T4OfNWBkQdE4Mtp XlNwIoKDI89+BmWWtZpluupR9OEXRyOZKu6bZuicqj21muWPlTSD639nX6hBcP3pZNQY Fbjhxi6vyh9PHcZnFWia8jo1EHCOzhQX6G0V0SScjnbFKT3sa+cvC4ZcmC7u97vS6o6+ 8EHA== X-Forwarded-Encrypted: i=1; AJvYcCVT4/l6EAyAcmMZ9yuT2z7wM23nPe+8Z1UBVT3ztxI0j8b1Ryb3NqdgM4Fg0ziWdDQQgLZwHwOydpwXC/U=@vger.kernel.org X-Gm-Message-State: AOJu0YzONW2ZKcJchwg7gTOWLD14bvgZ7DsRR6tICkNssyBArfWHCI8p U0DNfVbc7uBOTlIk1iaz4iWeaf+SQxCuf8DX17PweEL11stfN7ulz12H X-Gm-Gg: ASbGncutsugYGuGCiHvOPxdBCbY9fwUr+8Lv+6y/323NTBI0Nvl6dl7Ksco4oOsXA+k 2KF6vCUKstzdsozyUSpPsXCCLHBNQU/58XnbV/J4IMHSBVnR6J6wrTTSITXVtfrpzER38fxDKUA 4rVLOD5zkMAiOAv/Nj1cHsNg6Vtv1UGDjQ5oNessadkibUqKTkLjC0Jd4ndtyRUNN5qtpHifaHs cPEFC/Cip3WgNl6hZhyMRLLVvfPacofwZnbTGM53NTRq0D7RmdXM7TdZQsTSnziJM9Pkjc/VdZF 4E9VMI5D6IowL8Ypb+AxFuiNgvuRzX9fb/xfoqQFv7JY9io6MilPPDwcQC4cOHzY9Qo9NjWJqFL QGSHTpQVaqeuItlQGGILnmdPofJFYMEAuc+NsJnEPaOBuTYXNagJ2dlKswMchuxVo/HHxZrc49Y AZ1aBUU1l+TnW1oQ8PTW1is5g= X-Google-Smtp-Source: AGHT+IH6VRbTzJI8RtT9FoEPeKaOyeeGBeVhaYIRq1VvS5L2usOTAert7+MZWuTnflAua/VQeIG59A== X-Received: by 2002:a05:600c:1f0f:b0:45f:2c33:2731 with SMTP id 5b1f17b1804b1-477bab9c966mr50595e9.2.1763597728793; Wed, 19 Nov 2025 16:15:28 -0800 (PST) Received: from localhost ([2a03:2880:31ff::]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-477b106b10asm73859705e9.10.2025.11.19.16.15.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Nov 2025 16:15:27 -0800 (PST) From: Gustavo Luiz Duarte Date: Wed, 19 Nov 2025 16:14:50 -0800 Subject: [PATCH net-next v3 2/4] netconsole: Split userdata and sysdata Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251119-netconsole_dynamic_extradata-v3-2-497ac3191707@meta.com> References: <20251119-netconsole_dynamic_extradata-v3-0-497ac3191707@meta.com> In-Reply-To: <20251119-netconsole_dynamic_extradata-v3-0-497ac3191707@meta.com> To: Breno Leitao , Andre Carvalho , Simon Horman , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Gustavo Luiz Duarte X-Mailer: b4 0.13.0 Separate userdata and sysdata into distinct buffers to enable independent management. Previously, both were stored in a single extradata_complete buffer with a fixed size that accommodated both types of data. This separation allows: - userdata to grow dynamically (in subsequent patch) - sysdata to remain in a small static buffer - removal of complex entry counting logic that tracked both types together The split also simplifies the code by eliminating the need to check total entry count across both userdata and sysdata when enabling features, which allows to drop holding su_mutex on sysdata_*_enabled_store(). No functional change in this patch, just structural preparation for dynamic userdata allocation. Signed-off-by: Gustavo Luiz Duarte Reviewed-by: Breno Leitao --- drivers/net/netconsole.c | 215 +++++++++++++++++++++----------------------= ---- 1 file changed, 98 insertions(+), 117 deletions(-) diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index 5fe5896d6ff5..1bd811714322 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -50,7 +50,7 @@ MODULE_LICENSE("GPL"); /* The number 3 comes from userdata entry format characters (' ', '=3D', '= \n') */ #define MAX_EXTRADATA_NAME_LEN (MAX_EXTRADATA_ENTRY_LEN - \ MAX_EXTRADATA_VALUE_LEN - 3) -#define MAX_EXTRADATA_ITEMS 16 +#define MAX_USERDATA_ITEMS 16 #define MAX_PRINT_CHUNK 1000 =20 static char config[MAX_PARAM_LENGTH]; @@ -115,6 +115,8 @@ enum sysdata_feature { SYSDATA_RELEASE =3D BIT(2), /* Include a per-target message ID as part of sysdata */ SYSDATA_MSGID =3D BIT(3), + /* Sentinel: highest bit position */ + MAX_SYSDATA_ITEMS =3D 4, }; =20 /** @@ -122,8 +124,9 @@ enum sysdata_feature { * @list: Links this target into the target_list. * @group: Links us into the configfs subsystem hierarchy. * @userdata_group: Links to the userdata configfs hierarchy - * @extradata_complete: Cached, formatted string of append - * @userdata_length: String length of usedata in extradata_complete. + * @userdata: Cached, formatted string of append + * @userdata_length: String length of userdata. + * @sysdata: Cached, formatted string of append * @sysdata_fields: Sysdata features enabled. * @msgcounter: Message sent counter. * @stats: Packet send stats for the target. Used for debugging. @@ -152,8 +155,10 @@ struct netconsole_target { #ifdef CONFIG_NETCONSOLE_DYNAMIC struct config_group group; struct config_group userdata_group; - char extradata_complete[MAX_EXTRADATA_ENTRY_LEN * MAX_EXTRADATA_ITEMS]; + char userdata[MAX_EXTRADATA_ENTRY_LEN * MAX_USERDATA_ITEMS]; size_t userdata_length; + char sysdata[MAX_EXTRADATA_ENTRY_LEN * MAX_SYSDATA_ITEMS]; + /* bit-wise with sysdata_feature bits */ u32 sysdata_fields; /* protected by target_list_lock */ @@ -802,28 +807,14 @@ static ssize_t remote_ip_store(struct config_item *it= em, const char *buf, return ret; } =20 -/* Count number of entries we have in extradata. - * This is important because the extradata_complete only supports - * MAX_EXTRADATA_ITEMS entries. Before enabling any new {user,sys}data - * feature, number of entries needs to checked for available space. +/* Count number of entries we have in userdata. + * This is important because userdata only supports MAX_USERDATA_ITEMS + * entries. Before enabling any new userdata feature, number of entries ne= eds + * to checked for available space. */ -static size_t count_extradata_entries(struct netconsole_target *nt) +static size_t count_userdata_entries(struct netconsole_target *nt) { - size_t entries; - - /* Userdata entries */ - entries =3D list_count_nodes(&nt->userdata_group.cg_children); - /* Plus sysdata entries */ - if (nt->sysdata_fields & SYSDATA_CPU_NR) - entries +=3D 1; - if (nt->sysdata_fields & SYSDATA_TASKNAME) - entries +=3D 1; - if (nt->sysdata_fields & SYSDATA_RELEASE) - entries +=3D 1; - if (nt->sysdata_fields & SYSDATA_MSGID) - entries +=3D 1; - - return entries; + return list_count_nodes(&nt->userdata_group.cg_children); } =20 static ssize_t remote_mac_store(struct config_item *item, const char *buf, @@ -894,13 +885,13 @@ static void update_userdata(struct netconsole_target = *nt) =20 /* Clear the current string in case the last userdatum was deleted */ nt->userdata_length =3D 0; - nt->extradata_complete[0] =3D 0; + nt->userdata[0] =3D 0; =20 list_for_each(entry, &nt->userdata_group.cg_children) { struct userdatum *udm_item; struct config_item *item; =20 - if (child_count >=3D MAX_EXTRADATA_ITEMS) { + if (child_count >=3D MAX_USERDATA_ITEMS) { spin_unlock_irqrestore(&target_list_lock, flags); WARN_ON_ONCE(1); return; @@ -914,11 +905,11 @@ static void update_userdata(struct netconsole_target = *nt) if (strnlen(udm_item->value, MAX_EXTRADATA_VALUE_LEN) =3D=3D 0) continue; =20 - /* This doesn't overflow extradata_complete since it will write - * one entry length (1/MAX_EXTRADATA_ITEMS long), entry count is + /* This doesn't overflow userdata since it will write + * one entry length (1/MAX_USERDATA_ITEMS long), entry count is * checked to not exceed MAX items with child_count above */ - nt->userdata_length +=3D scnprintf(&nt->extradata_complete[nt->userdata_= length], + nt->userdata_length +=3D scnprintf(&nt->userdata[nt->userdata_length], MAX_EXTRADATA_ENTRY_LEN, " %s=3D%s\n", item->ci_name, udm_item->value); } @@ -962,7 +953,7 @@ static void disable_sysdata_feature(struct netconsole_t= arget *nt, enum sysdata_feature feature) { nt->sysdata_fields &=3D ~feature; - nt->extradata_complete[nt->userdata_length] =3D 0; + nt->sysdata[0] =3D 0; } =20 static ssize_t sysdata_msgid_enabled_store(struct config_item *item, @@ -982,12 +973,6 @@ static ssize_t sysdata_msgid_enabled_store(struct conf= ig_item *item, if (msgid_enabled =3D=3D curr) goto unlock_ok; =20 - if (msgid_enabled && - count_extradata_entries(nt) >=3D MAX_EXTRADATA_ITEMS) { - ret =3D -ENOSPC; - goto unlock; - } - if (msgid_enabled) nt->sysdata_fields |=3D SYSDATA_MSGID; else @@ -995,7 +980,6 @@ static ssize_t sysdata_msgid_enabled_store(struct confi= g_item *item, =20 unlock_ok: ret =3D strnlen(buf, count); -unlock: mutex_unlock(&dynamic_netconsole_mutex); mutex_unlock(&netconsole_subsys.su_mutex); return ret; @@ -1018,12 +1002,6 @@ static ssize_t sysdata_release_enabled_store(struct = config_item *item, if (release_enabled =3D=3D curr) goto unlock_ok; =20 - if (release_enabled && - count_extradata_entries(nt) >=3D MAX_EXTRADATA_ITEMS) { - ret =3D -ENOSPC; - goto unlock; - } - if (release_enabled) nt->sysdata_fields |=3D SYSDATA_RELEASE; else @@ -1031,7 +1009,6 @@ static ssize_t sysdata_release_enabled_store(struct c= onfig_item *item, =20 unlock_ok: ret =3D strnlen(buf, count); -unlock: mutex_unlock(&dynamic_netconsole_mutex); mutex_unlock(&netconsole_subsys.su_mutex); return ret; @@ -1054,12 +1031,6 @@ static ssize_t sysdata_taskname_enabled_store(struct= config_item *item, if (taskname_enabled =3D=3D curr) goto unlock_ok; =20 - if (taskname_enabled && - count_extradata_entries(nt) >=3D MAX_EXTRADATA_ITEMS) { - ret =3D -ENOSPC; - goto unlock; - } - if (taskname_enabled) nt->sysdata_fields |=3D SYSDATA_TASKNAME; else @@ -1067,7 +1038,6 @@ static ssize_t sysdata_taskname_enabled_store(struct = config_item *item, =20 unlock_ok: ret =3D strnlen(buf, count); -unlock: mutex_unlock(&dynamic_netconsole_mutex); mutex_unlock(&netconsole_subsys.su_mutex); return ret; @@ -1092,27 +1062,16 @@ static ssize_t sysdata_cpu_nr_enabled_store(struct = config_item *item, /* no change requested */ goto unlock_ok; =20 - if (cpu_nr_enabled && - count_extradata_entries(nt) >=3D MAX_EXTRADATA_ITEMS) { - /* user wants the new feature, but there is no space in the - * buffer. - */ - ret =3D -ENOSPC; - goto unlock; - } - if (cpu_nr_enabled) nt->sysdata_fields |=3D SYSDATA_CPU_NR; else - /* This is special because extradata_complete might have - * remaining data from previous sysdata, and it needs to be - * cleaned. + /* This is special because sysdata might have remaining data + * from previous sysdata, and it needs to be cleaned. */ disable_sysdata_feature(nt, SYSDATA_CPU_NR); =20 unlock_ok: ret =3D strnlen(buf, count); -unlock: mutex_unlock(&dynamic_netconsole_mutex); mutex_unlock(&netconsole_subsys.su_mutex); return ret; @@ -1156,7 +1115,7 @@ static struct config_item *userdatum_make_item(struct= config_group *group, =20 ud =3D to_userdata(&group->cg_item); nt =3D userdata_to_target(ud); - if (count_extradata_entries(nt) >=3D MAX_EXTRADATA_ITEMS) + if (count_userdata_entries(nt) >=3D MAX_USERDATA_ITEMS) return ERR_PTR(-ENOSPC); =20 udm =3D kzalloc(sizeof(*udm), GFP_KERNEL); @@ -1363,22 +1322,21 @@ static void populate_configfs_item(struct netconsol= e_target *nt, =20 static int sysdata_append_cpu_nr(struct netconsole_target *nt, int offset) { - /* Append cpu=3D%d at extradata_complete after userdata str */ - return scnprintf(&nt->extradata_complete[offset], + return scnprintf(&nt->sysdata[offset], MAX_EXTRADATA_ENTRY_LEN, " cpu=3D%u\n", raw_smp_processor_id()); } =20 static int sysdata_append_taskname(struct netconsole_target *nt, int offse= t) { - return scnprintf(&nt->extradata_complete[offset], + return scnprintf(&nt->sysdata[offset], MAX_EXTRADATA_ENTRY_LEN, " taskname=3D%s\n", current->comm); } =20 static int sysdata_append_release(struct netconsole_target *nt, int offset) { - return scnprintf(&nt->extradata_complete[offset], + return scnprintf(&nt->sysdata[offset], MAX_EXTRADATA_ENTRY_LEN, " release=3D%s\n", init_utsname()->release); } @@ -1386,46 +1344,36 @@ static int sysdata_append_release(struct netconsole= _target *nt, int offset) static int sysdata_append_msgid(struct netconsole_target *nt, int offset) { wrapping_assign_add(nt->msgcounter, 1); - return scnprintf(&nt->extradata_complete[offset], + return scnprintf(&nt->sysdata[offset], MAX_EXTRADATA_ENTRY_LEN, " msgid=3D%u\n", nt->msgcounter); } =20 /* - * prepare_extradata - append sysdata at extradata_complete in runtime + * prepare_sysdata - append sysdata in runtime * @nt: target to send message to */ -static int prepare_extradata(struct netconsole_target *nt) +static int prepare_sysdata(struct netconsole_target *nt) { - int extradata_len; - - /* userdata was appended when configfs write helper was called - * by update_userdata(). - */ - extradata_len =3D nt->userdata_length; + int sysdata_len =3D 0; =20 if (!nt->sysdata_fields) goto out; =20 if (nt->sysdata_fields & SYSDATA_CPU_NR) - extradata_len +=3D sysdata_append_cpu_nr(nt, extradata_len); + sysdata_len +=3D sysdata_append_cpu_nr(nt, sysdata_len); if (nt->sysdata_fields & SYSDATA_TASKNAME) - extradata_len +=3D sysdata_append_taskname(nt, extradata_len); + sysdata_len +=3D sysdata_append_taskname(nt, sysdata_len); if (nt->sysdata_fields & SYSDATA_RELEASE) - extradata_len +=3D sysdata_append_release(nt, extradata_len); + sysdata_len +=3D sysdata_append_release(nt, sysdata_len); if (nt->sysdata_fields & SYSDATA_MSGID) - extradata_len +=3D sysdata_append_msgid(nt, extradata_len); + sysdata_len +=3D sysdata_append_msgid(nt, sysdata_len); =20 - WARN_ON_ONCE(extradata_len > - MAX_EXTRADATA_ENTRY_LEN * MAX_EXTRADATA_ITEMS); + WARN_ON_ONCE(sysdata_len > + MAX_EXTRADATA_ENTRY_LEN * MAX_SYSDATA_ITEMS); =20 out: - return extradata_len; -} -#else /* CONFIG_NETCONSOLE_DYNAMIC not set */ -static int prepare_extradata(struct netconsole_target *nt) -{ - return 0; + return sysdata_len; } #endif /* CONFIG_NETCONSOLE_DYNAMIC */ =20 @@ -1527,11 +1475,13 @@ static void send_msg_no_fragmentation(struct netcon= sole_target *nt, int msg_len, int release_len) { - const char *extradata =3D NULL; + const char *userdata =3D NULL; + const char *sysdata =3D NULL; const char *release; =20 #ifdef CONFIG_NETCONSOLE_DYNAMIC - extradata =3D nt->extradata_complete; + userdata =3D nt->userdata; + sysdata =3D nt->sysdata; #endif =20 if (release_len) { @@ -1543,10 +1493,15 @@ static void send_msg_no_fragmentation(struct netcon= sole_target *nt, memcpy(nt->buf, msg, msg_len); } =20 - if (extradata) + if (userdata) msg_len +=3D scnprintf(&nt->buf[msg_len], - MAX_PRINT_CHUNK - msg_len, - "%s", extradata); + MAX_PRINT_CHUNK - msg_len, "%s", + userdata); + + if (sysdata) + msg_len +=3D scnprintf(&nt->buf[msg_len], + MAX_PRINT_CHUNK - msg_len, "%s", + sysdata); =20 send_udp(nt, nt->buf, msg_len); } @@ -1561,33 +1516,45 @@ static void append_release(char *buf) =20 static void send_fragmented_body(struct netconsole_target *nt, const char *msgbody_ptr, int header_len, - int msgbody_len, int extradata_len) + int msgbody_len, int sysdata_len) { - const char *extradata_ptr =3D NULL; + const char *userdata_ptr =3D NULL; + const char *sysdata_ptr =3D NULL; int data_len, data_sent =3D 0; - int extradata_offset =3D 0; + int userdata_offset =3D 0; + int sysdata_offset =3D 0; int msgbody_offset =3D 0; + int userdata_len =3D 0; =20 #ifdef CONFIG_NETCONSOLE_DYNAMIC - extradata_ptr =3D nt->extradata_complete; + userdata_ptr =3D nt->userdata; + sysdata_ptr =3D nt->sysdata; + userdata_len =3D nt->userdata_length; #endif - if (WARN_ON_ONCE(!extradata_ptr && extradata_len !=3D 0)) + if (WARN_ON_ONCE(!userdata_ptr && userdata_len !=3D 0)) + return; + + if (WARN_ON_ONCE(!sysdata_ptr && sysdata_len !=3D 0)) return; =20 /* data_len represents the number of bytes that will be sent. This is * bigger than MAX_PRINT_CHUNK, thus, it will be split in multiple * packets */ - data_len =3D msgbody_len + extradata_len; + data_len =3D msgbody_len + userdata_len + sysdata_len; =20 /* In each iteration of the while loop below, we send a packet * containing the header and a portion of the data. The data is - * composed of two parts: msgbody and extradata. We keep track of how - * many bytes have been sent so far using the data_sent variable, which - * ranges from 0 to the total bytes to be sent. + * composed of three parts: msgbody, userdata, and sysdata. + * We keep track of how many bytes have been sent from each part using + * the *_offset variables. + * We keep track of how many bytes have been sent overall using the + * data_sent variable, which ranges from 0 to the total bytes to be + * sent. */ while (data_sent < data_len) { - int extradata_left =3D extradata_len - extradata_offset; + int userdata_left =3D userdata_len - userdata_offset; + int sysdata_left =3D sysdata_len - sysdata_offset; int msgbody_left =3D msgbody_len - msgbody_offset; int buf_offset =3D 0; int this_chunk =3D 0; @@ -1608,13 +1575,24 @@ static void send_fragmented_body(struct netconsole_= target *nt, buf_offset +=3D this_chunk; data_sent +=3D this_chunk; =20 - /* after msgbody, append extradata */ - if (extradata_ptr && extradata_left) { - this_chunk =3D min(extradata_left, + /* after msgbody, append userdata */ + if (userdata_ptr && userdata_left) { + this_chunk =3D min(userdata_left, MAX_PRINT_CHUNK - buf_offset); memcpy(nt->buf + buf_offset, - extradata_ptr + extradata_offset, this_chunk); - extradata_offset +=3D this_chunk; + userdata_ptr + userdata_offset, this_chunk); + userdata_offset +=3D this_chunk; + buf_offset +=3D this_chunk; + data_sent +=3D this_chunk; + } + + /* after userdata, append sysdata */ + if (sysdata_ptr && sysdata_left) { + this_chunk =3D min(sysdata_left, + MAX_PRINT_CHUNK - buf_offset); + memcpy(nt->buf + buf_offset, + sysdata_ptr + sysdata_offset, this_chunk); + sysdata_offset +=3D this_chunk; buf_offset +=3D this_chunk; data_sent +=3D this_chunk; } @@ -1631,7 +1609,7 @@ static void send_msg_fragmented(struct netconsole_tar= get *nt, const char *msg, int msg_len, int release_len, - int extradata_len) + int sysdata_len) { int header_len, msgbody_len; const char *msgbody; @@ -1660,7 +1638,7 @@ static void send_msg_fragmented(struct netconsole_tar= get *nt, * will be replaced */ send_fragmented_body(nt, msgbody, header_len, msgbody_len, - extradata_len); + sysdata_len); } =20 /** @@ -1676,19 +1654,22 @@ static void send_msg_fragmented(struct netconsole_t= arget *nt, static void send_ext_msg_udp(struct netconsole_target *nt, const char *msg, int msg_len) { + int userdata_len =3D 0; int release_len =3D 0; - int extradata_len; - - extradata_len =3D prepare_extradata(nt); + int sysdata_len =3D 0; =20 +#ifdef CONFIG_NETCONSOLE_DYNAMIC + sysdata_len =3D prepare_sysdata(nt); + userdata_len =3D nt->userdata_length; +#endif if (nt->release) release_len =3D strlen(init_utsname()->release) + 1; =20 - if (msg_len + release_len + extradata_len <=3D MAX_PRINT_CHUNK) + if (msg_len + release_len + sysdata_len + userdata_len <=3D MAX_PRINT_CHU= NK) return send_msg_no_fragmentation(nt, msg, msg_len, release_len); =20 return send_msg_fragmented(nt, msg, msg_len, release_len, - extradata_len); + sysdata_len); } =20 static void write_ext_msg(struct console *con, const char *msg, --=20 2.47.3