Commit 9c40e1aa authored by Andrew Halaney's avatar Andrew Halaney Committed by Greg Kroah-Hartman
Browse files

dyndbg: Remove support for ddebug_query param 



This param has been deprecated for a very long time now, let's rip it
out.

Signed-off-by: default avatarAndrew Halaney <ahalaney@redhat.com>
Signed-off-by: default avatarJason Baron <jbaron@akamai.com>
Link: https://lore.kernel.org/r/1634139622-20667-3-git-send-email-jbaron@akamai.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5ca17397

Documentation/admin-guide/dynamic-debug-howto.rst

+2 −4
Original line number Diff line number Diff line
@@ -249,8 +249,7 @@ Debug messages during Boot Process 


To activate debug messages for core code and built-in modules during

the boot process, even before userspace and debugfs exists, use

``dyndbg="QUERY"``, ``module.dyndbg="QUERY"``, or ``ddebug_query="QUERY"``

(``ddebug_query`` is obsoleted by ``dyndbg``, and deprecated).  QUERY follows

``dyndbg="QUERY"`` or ``module.dyndbg="QUERY"``.  QUERY follows

the syntax described above, but must not exceed 1023 characters.  Your

bootloader may impose lower limits.
@@ -270,8 +269,7 @@ this boot parameter for debugging purposes. 


If ``foo`` module is not built-in, ``foo.dyndbg`` will still be processed at

boot time, without effect, but will be reprocessed when module is

loaded later. ``ddebug_query=`` and bare ``dyndbg=`` are only processed at

boot.

loaded later. Bare ``dyndbg=`` is only processed at boot.





Debug Messages at Module Initialization Time

Documentation/admin-guide/kernel-parameters.txt

+0 −5
Original line number Diff line number Diff line
@@ -841,11 +841,6 @@ 
			Format: <port#>,<type>

			See also Documentation/input/devices/joystick-parport.rst



	ddebug_query=	[KNL,DYNAMIC_DEBUG] Enable debug messages at early boot

			time. See

			Documentation/admin-guide/dynamic-debug-howto.rst for

			details.  Deprecated, see dyndbg.



	debug		[KNL] Enable kernel debugging (events log level).



	debug_boot_weak_hash

lib/dynamic_debug.c

+0 −25
Original line number Diff line number Diff line
@@ -746,21 +746,6 @@ EXPORT_SYMBOL(__dynamic_ibdev_dbg); 


#endif



#define DDEBUG_STRING_SIZE 1024

static __initdata char ddebug_setup_string[DDEBUG_STRING_SIZE];



static __init int ddebug_setup_query(char *str)

{

	if (strlen(str) >= DDEBUG_STRING_SIZE) {

		pr_warn("ddebug boot param string too large\n");

		return 0;

	}

	strlcpy(ddebug_setup_string, str, DDEBUG_STRING_SIZE);

	return 1;

}



__setup("ddebug_query=", ddebug_setup_query);



/*

 * Install a noop handler to make dyndbg look like a normal kernel cli param.

 * This avoids warnings about dyndbg being an unknown cli param when supplied
@@ -1133,16 +1118,6 @@ static int __init dynamic_debug_init(void) 
		 entries, modct, (int)((modct * sizeof(struct ddebug_table)) >> 10),

		 (int)((entries * sizeof(struct _ddebug)) >> 10));



	/* apply ddebug_query boot param, dont unload tables on err */

	if (ddebug_setup_string[0] != '\0') {

		pr_warn("ddebug_query param name is deprecated, change it to dyndbg\n");

		ret = ddebug_exec_queries(ddebug_setup_string, NULL);

		if (ret < 0)

			pr_warn("Invalid ddebug boot param %s\n",

				ddebug_setup_string);

		else

			pr_info("%d changes by ddebug_query\n", ret);

	}

	/* now that ddebug tables are loaded, process all boot args

	 * again to find and activate queries given in dyndbg params.

	 * While this has already been done for known boot params, it