Commit 936cf61c authored by Sami Tolvanen's avatar Sami Tolvanen Committed by Masahiro Yamada
Browse files

gendwarfksyms: Add support for kABI rules 



Distributions that want to maintain a stable kABI need the ability
to make ABI compatible changes to kernel without affecting symbol
versions, either because of LTS updates or backports.

With genksyms, developers would typically hide these changes from
version calculation with #ifndef __GENKSYMS__, which would result
in the symbol version not changing even though the actual type has
changed.  When we process precompiled object files, this isn't an
option.

To support this use case, add a --stable command line flag that
gates kABI stability features that are not needed in mainline
kernels, but can be useful for distributions, and add support for
kABI rules, which can be used to restrict gendwarfksyms output.

The rules are specified as a set of null-terminated strings stored
in the .discard.gendwarfksyms.kabi_rules section. Each rule consists
of four strings as follows:

  "version\0type\0target\0value"

The version string ensures the structure can be changed in a
backwards compatible way. The type string indicates the type of the
rule, and target and value strings contain rule-specific data.

Initially support two simple rules:

  1. Declaration-only types

     A type declaration can change into a full definition when
     additional includes are pulled in to the TU, which changes the
     versions of any symbol that references the type. Add support
     for defining declaration-only types whose definition is not
     expanded during versioning.

  2. Ignored enumerators

     It's possible to add new enum fields without changing the ABI,
     but as the fields are included in symbol versioning, this would
     change the versions. Add support for ignoring specific fields.

  3. Overridden enumerator values

     Add support for overriding enumerator values when calculating
     versions. This may be needed when the last field of the enum
     is used as a sentinel and new fields must be added before it.

Add examples for using the rules under the examples/ directory.

Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 71378888

scripts/gendwarfksyms/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ gendwarfksyms-objs += gendwarfksyms.o 
gendwarfksyms-objs += cache.o

gendwarfksyms-objs += die.o

gendwarfksyms-objs += dwarf.o

gendwarfksyms-objs += kabi.o

gendwarfksyms-objs += symbols.o

gendwarfksyms-objs += types.o

scripts/gendwarfksyms/dwarf.c

+22 −3
Original line number Diff line number Diff line
@@ -120,13 +120,16 @@ static bool is_definition_private(Dwarf_Die *die) 
	return !!res;

}



static bool is_kabi_definition(Dwarf_Die *die)

static bool is_kabi_definition(struct die *cache, Dwarf_Die *die)

{

	bool value;



	if (get_flag_attr(die, DW_AT_declaration, &value) && value)

		return false;



	if (kabi_is_declonly(cache->fqn))

		return false;



	return !is_definition_private(die);

}
@@ -515,9 +518,10 @@ static void __process_structure_type(struct state *state, struct die *cache, 
	process(cache, " {");

	process_linebreak(cache, 1);



	expand = state->expand.expand && is_kabi_definition(die);

	expand = state->expand.expand && is_kabi_definition(cache, die);



	if (expand) {

		state->expand.current_fqn = cache->fqn;

		check(process_die_container(state, cache, die, process_func,

					    match_func));

	}
@@ -548,13 +552,26 @@ DEFINE_PROCESS_STRUCTURE_TYPE(union) 
static void process_enumerator_type(struct state *state, struct die *cache,

				    Dwarf_Die *die)

{

	bool overridden = false;

	Dwarf_Word value;



	if (stable) {

		/* Get the fqn before we process anything */

		update_fqn(cache, die);



		if (kabi_is_enumerator_ignored(state->expand.current_fqn,

					       cache->fqn))

			return;



		overridden = kabi_get_enumerator_value(

			state->expand.current_fqn, cache->fqn, &value);

	}



	process_list_comma(state, cache);

	process(cache, "enumerator");

	process_fqn(cache, die);



	if (get_udata_attr(die, DW_AT_const_value, &value)) {

	if (overridden || get_udata_attr(die, DW_AT_const_value, &value)) {

		process(cache, " = ");

		process_fmt(cache, "%" PRIu64, value);

	}
@@ -620,6 +637,7 @@ static void process_cached(struct state *state, struct die *cache, 
static void state_init(struct state *state)

{

	state->expand.expand = true;

	state->expand.current_fqn = NULL;

	cache_init(&state->expansion_cache);

}
@@ -627,6 +645,7 @@ static void expansion_state_restore(struct expansion_state *state, 
				    struct expansion_state *saved)

{

	state->expand = saved->expand;

	state->current_fqn = saved->current_fqn;

}



static void expansion_state_save(struct expansion_state *state,

scripts/gendwarfksyms/examples/kabi.h

0 → 100644
+70 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (C) 2024 Google LLC

 *

 * Example macros for maintaining kABI stability.

 *

 * This file is based on android_kabi.h, which has the following notice:

 *

 * Heavily influenced by rh_kabi.h which came from the RHEL/CENTOS kernel

 * and was:

 *	Copyright (c) 2014 Don Zickus

 *	Copyright (c) 2015-2018 Jiri Benc

 *	Copyright (c) 2015 Sabrina Dubroca, Hannes Frederic Sowa

 *	Copyright (c) 2016-2018 Prarit Bhargava

 *	Copyright (c) 2017 Paolo Abeni, Larry Woodman

 */



#ifndef __KABI_H__

#define __KABI_H__



/* Kernel macros for userspace testing. */

#ifndef __aligned

#define __aligned(x) __attribute__((__aligned__(x)))

#endif

#ifndef __used

#define __used __attribute__((__used__))

#endif

#ifndef __section

#define __section(section) __attribute__((__section__(section)))

#endif

#ifndef __PASTE

#define ___PASTE(a, b) a##b

#define __PASTE(a, b) ___PASTE(a, b)

#endif

#ifndef __stringify

#define __stringify_1(x...) #x

#define __stringify(x...) __stringify_1(x)

#endif



#define __KABI_RULE(hint, target, value)                             \

	static const char __PASTE(__gendwarfksyms_rule_,             \

				  __COUNTER__)[] __used __aligned(1) \

		__section(".discard.gendwarfksyms.kabi_rules") =     \

			"1\0" #hint "\0" #target "\0" #value



/*

 * KABI_DECLONLY(fqn)

 *   Treat the struct/union/enum fqn as a declaration, i.e. even if

 *   a definition is available, don't expand the contents.

 */

#define KABI_DECLONLY(fqn) __KABI_RULE(declonly, fqn, )



/*

 * KABI_ENUMERATOR_IGNORE(fqn, field)

 *   When expanding enum fqn, skip the provided field. This makes it

 *   possible to hide added enum fields from versioning.

 */

#define KABI_ENUMERATOR_IGNORE(fqn, field) \

	__KABI_RULE(enumerator_ignore, fqn field, )



/*

 * KABI_ENUMERATOR_VALUE(fqn, field, value)

 *   When expanding enum fqn, use the provided value for the

 *   specified field. This makes it possible to override enumerator

 *   values when calculating versions.

 */

#define KABI_ENUMERATOR_VALUE(fqn, field, value) \

	__KABI_RULE(enumerator_value, fqn field, value)



#endif /* __KABI_H__ */

scripts/gendwarfksyms/examples/kabi_ex.c

0 → 100644
+14 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * kabi_ex.c

 *

 * Copyright (C) 2024 Google LLC

 *

 * Examples for kABI stability features with --stable. See kabi_ex.h

 * for details.

 */



#include "kabi_ex.h"



struct s e0;

enum e e1;

scripts/gendwarfksyms/examples/kabi_ex.h

0 → 100644
+64 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * kabi_ex.h

 *

 * Copyright (C) 2024 Google LLC

 *

 * Examples for kABI stability features with --stable.

 */



/*

 * The comments below each example contain the expected gendwarfksyms

 * output, which can be verified using LLVM's FileCheck tool:

 *

 * https://llvm.org/docs/CommandGuide/FileCheck.html

 *

 * Usage:

 *

 * $ gcc -g -c examples/kabi_ex.c -o examples/kabi_ex.o

 *

 * $ nm examples/kabi_ex.o | awk '{ print $NF }' | \

 * 	./gendwarfksyms --stable --dump-dies \

 * 		examples/kabi_ex.o 2>&1 >/dev/null | \

 * 	FileCheck examples/kabi_ex.h --check-prefix=STABLE

 */



#ifndef __KABI_EX_H__

#define __KABI_EX_H__



#include "kabi.h"



/*

 * Example: kABI rules

 */



struct s {

	int a;

};



KABI_DECLONLY(s);



/*

 * STABLE:      variable structure_type s {

 * STABLE-NEXT: }

 */



enum e {

	A,

	B,

	C,

	D,

};



KABI_ENUMERATOR_IGNORE(e, B);

KABI_ENUMERATOR_IGNORE(e, C);

KABI_ENUMERATOR_VALUE(e, D, 123456789);



/*

 * STABLE:      variable enumeration_type e {

 * STABLE-NEXT:   enumerator A = 0 ,

 * STABLE-NEXT:   enumerator D = 123456789

 * STABLE-NEXT: } byte_size(4)

 */



#endif /* __KABI_EX_H__ */